diff options
author | Pali Rohár <pali.rohar@gmail.com> | 2012-09-23 13:51:29 +0200 |
---|---|---|
committer | Pali Rohár <pali.rohar@gmail.com> | 2012-09-23 13:51:29 +0200 |
commit | b2bd1d90c71bd1e192467ccd67df07618d8a1707 (patch) | |
tree | 6969f33bc9d66e59418cff9c803c3082e236f543 /src/usb-device.c | |
parent | 863cf8134a4eee1826fda5143b27e394f1dacbe1 (diff) | |
download | 0xFFFF-b2bd1d90c71bd1e192467ccd67df07618d8a1707.tar.bz2 |
usb-device: Fix serial number string
Diffstat (limited to 'src/usb-device.c')
-rw-r--r-- | src/usb-device.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/usb-device.c b/src/usb-device.c index cdd6275..ff02721 100644 --- a/src/usb-device.c +++ b/src/usb-device.c @@ -22,6 +22,7 @@ #include <stdint.h> #include <string.h> #include <errno.h> +#include <ctype.h> #include <usb.h> @@ -76,14 +77,16 @@ static void usb_descriptor_info_print(usb_dev_handle * udev, struct usb_device * int ret; int i; - buf[0] = 0; + memset(buf, 0, sizeof(buf)); usb_get_string_simple(udev, dev->descriptor.iProduct, buf, sizeof(buf)); PRINTF_LINE("USB device product string: %s", buf[0] ? buf : "(not detected)"); PRINTF_END(); - buf[0] = 0; + memset(buf, 0, sizeof(buf)); memset(buf2, 0, sizeof(buf2)); ret = usb_get_string_simple(udev, dev->descriptor.iSerialNumber, buf, sizeof(buf)); + if ( ! isalnum(buf[0]) ) + buf[0] = 0; for ( i = 0; i < ret; i+=2 ) { sscanf(buf+i, "%2x", &x); if ( x > 32 && x < 128 ) @@ -93,6 +96,8 @@ static void usb_descriptor_info_print(usb_dev_handle * udev, struct usb_device * break; } } + if ( ! isalnum(buf2[0]) ) + buf2[0] = 0; PRINTF_LINE("USB device serial number string: %s", buf2[0] ? buf2 : ( buf[0] ? buf : "(not detected)" )); PRINTF_END(); |