*_id: fix zero length in set_str()

Thanks to Olaf Hering <olh@suse.de>

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index 2840e914579c4118a0d6941ec91bd1c8522bae9a..9579db310593b5608493efd003808800f7265d8e 100644 (file)
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -68,7 +68,7 @@ static void set_str(char *to, const char *from, size_t count)
 
        /* strip trailing whitespace */
        len = strnlen(from, count);
-       while (isspace(from[len-1]))
+       while (len && isspace(from[len-1]))
                len--;
 
        /* strip leading whitespace */

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index a46d1b377da97dfd08075a76b37f6ebdc4da0cac..a86b004709a219c4fa8cb68125a2c7ff05b63e3a 100644 (file)
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -107,7 +107,7 @@ static void set_str(char *to, const char *from, size_t count)
 
        /* strip trailing whitespace */
        len = strnlen(from, count);
-       while (isspace(from[len-1]))
+       while (len && isspace(from[len-1]))
                len--;
 
        /* strip leading whitespace */

diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index f5ee7959246a8d3a93653497ad0441988915aba7..c4ce0c610365583c3f55635d905a84dbb51e1da8 100644 (file)
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -82,7 +82,7 @@ static void set_str(char *to, const char *from, size_t count)
 
        /* strip trailing whitespace */
        len = strnlen(from, count);
-       while (isspace(from[len-1]))
+       while (len && isspace(from[len-1]))
                len--;
 
        /* strip leading whitespace */

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 6a9d1120e0cf30e44396ef32628f830f1cec85c0..fe0b3a0ed070039201fd426cf53850d7b5f605b2 100644 (file)
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -66,7 +66,7 @@ static void set_str(char *to, const char *from, size_t count)
 
        /* strip trailing whitespace */
        len = strnlen(from, count);
-       while (isspace(from[len-1]))
+       while (len && isspace(from[len-1]))
                len--;
 
        /* strip leading whitespace */