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 4c95d65..ebbccab 100644 (file)
--- 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 d3db41c..7acf3a6 100644 (file)
--- 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) {