From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 2 Mar 2003 03:57:31 +0000 (-0500)
Subject: tag.c (blkid_set_tag): Fix bug; don't return an error when
X-Git-Tag: E2FSPROGS-1_33-WIP-0306~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e89304878045b35c811201b04d3efd38916dbd1;p=thirdparty%2Fe2fsprogs.git

tag.c (blkid_set_tag): Fix bug; don't return an error when
	deleting a tag by setting the value to NULL.  This
	caused a failed device verification to loop forever in
	blkid_verify_devname().
---

diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog
index 4c95d654b..ebbccabe9 100644
--- a/lib/blkid/ChangeLog
+++ b/lib/blkid/ChangeLog
@@ -1,5 +1,10 @@
 2003-03-01  Theodore Ts'o  <tytso@mit.edu>
 
+	* tag.c (blkid_set_tag): Fix bug; don't return an error when
+		deleting a tag by setting the value to NULL.  This
+		caused a failed device verification to loop forever in
+		blkid_verify_devname().
+
 	* resolve.c (main): Update debugging test program so that it
 		compiles with the latest blkid API changes.
 
diff --git a/lib/blkid/tag.c b/lib/blkid/tag.c
index d3db41c07..7acf3a6a3 100644
--- a/lib/blkid/tag.c
+++ b/lib/blkid/tag.c
@@ -108,7 +108,7 @@ int blkid_set_tag(blkid_dev dev, const char *name,
 	if (!dev || !name)
 		return -BLKID_ERR_PARAM;
 
-	if (!(val = blkid_strndup(value, vlength)))
+	if (!(val = blkid_strndup(value, vlength)) && value)
 		return -BLKID_ERR_MEM;
 	t = blkid_find_tag_dev(dev, name);
 	if (!value) {