diff options
| author | Richard Yao <ryao@gentoo.org> | 2013-03-17 12:50:36 -0400 |
|---|---|---|
| committer | Richard Yao <ryao@cs.stonybrook.edu> | 2013-03-17 12:50:36 -0400 |
| commit | 788245436d3c9e3fbc84285d60f3b4c40e18c207 (patch) | |
| tree | 2983d000a6b91e6c6f0877fadc14b47df5e0adee /src/udev/udev-builtin-usb_id.c | |
| parent | 15cad0e19bc6e79fe70b23b1b0f076ab23d4d7a4 (diff) | |
| parent | 261132097e647d259c851b32c3c5798fa13cc67a (diff) | |
Merge remote-tracking branch 'origin/follow-upstream'
Signed-off-by: Richard Yao <ryao@gentoo.org>
Diffstat (limited to 'src/udev/udev-builtin-usb_id.c')
| -rw-r--r-- | src/udev/udev-builtin-usb_id.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c index 13d1226393..ce9ffe7db8 100644 --- a/src/udev/udev-builtin-usb_id.c +++ b/src/udev/udev-builtin-usb_id.c @@ -189,7 +189,7 @@ static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len pos = 0; strpos = 0; ifs_str[0] = '\0'; - while (pos < sizeof(buf) && strpos+7 < len-2) { + while (pos < size && strpos+7 < len-2) { struct usb_interface_descriptor *desc; char if_str[8]; @@ -432,6 +432,17 @@ fallback: usb_serial = udev_device_get_sysattr_value(dev_usb, "serial"); if (usb_serial) { + const unsigned char *p; + + /* http://msdn.microsoft.com/en-us/library/windows/hardware/gg487321.aspx */ + for (p = (unsigned char *)usb_serial; *p != '\0'; p++) + if (*p < 0x20 || *p > 0x7f || *p == ',') { + usb_serial = NULL; + break; + } + } + + if (usb_serial) { util_replace_whitespace(usb_serial, serial_str, sizeof(serial_str)-1); util_replace_chars(serial_str, NULL); } |