From c907c823c388dfbdfa7054cfb2f4e9b92eb31e2e Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 22 Aug 2005 11:37:12 +0200 Subject: [PATCH] *_id: fix zero length in set_str() Thanks to Olaf Hering Signed-off-by: Kay Sievers --- extras/ata_id/ata_id.c | 2 +- extras/scsi_id/scsi_id.c | 2 +- extras/usb_id/usb_id.c | 2 +- extras/volume_id/vol_id.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c index 2840e9145..9579db310 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 a46d1b377..a86b00470 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 f5ee79592..c4ce0c610 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 6a9d1120e..fe0b3a0ed 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 */ -- 2.30.2