summaryrefslogtreecommitdiff
path: root/extras
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@suse.de>2005-08-22 11:37:12 +0200
committerKay Sievers <kay.sievers@suse.de>2005-08-22 11:37:12 +0200
commitc907c823c388dfbdfa7054cfb2f4e9b92eb31e2e (patch)
tree88bc34b0f6ce8e5fdcec9f0a31bd6d4651285835 /extras
parent8c11a2f0ff27264513033691bb818262f009fe4e (diff)
*_id: fix zero length in set_str()
Thanks to Olaf Hering <olh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@suse.de>
Diffstat (limited to 'extras')
-rw-r--r--extras/ata_id/ata_id.c2
-rw-r--r--extras/scsi_id/scsi_id.c2
-rw-r--r--extras/usb_id/usb_id.c2
-rw-r--r--extras/volume_id/vol_id.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index 2840e91457..9579db3105 100644
--- 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 a46d1b377d..a86b004709 100644
--- 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 f5ee795924..c4ce0c6103 100644
--- 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 6a9d1120e0..fe0b3a0ed0 100644
--- 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 */