X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-usb_id.c;fp=src%2Fudev%2Fudev-builtin-usb_id.c;h=ee83d4fde9ac44cf8772ade6e875e993f82ac61f;hb=a2cbfd5916ee13b216a314826083e4c4e06930d1;hp=01e42ca7b1a96d7fc9f7357830068b916300a467;hpb=02a6fc3ea69ba8801bc1864dd393d8df31559667;p=elogind.git

diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
index 01e42ca7b..ee83d4fde 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -431,6 +431,17 @@ fallback:
                 const char *usb_serial;
 
                 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);