]> git.proxmox.com Git - qemu.git/commitdiff
Avoid crash on '-usbdevice <device>' without parameters
authorJan Kiszka <jan.kiszka@web.de>
Wed, 2 Jun 2010 20:19:55 +0000 (17:19 -0300)
committerAurelien Jarno <aurelien@aurel32.net>
Wed, 9 Jun 2010 10:44:57 +0000 (12:44 +0200)
Many usbdevice_init implementors assume params is non-NULL.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 702f3e0fb52c124c07f215426eeadb70a716643f)

hw/usb-bus.c

index 7c823147abbae68dcab07ac12eea36518e5e5366..3bb89862b0c36bdf0b372f04c6ff4ac6479e5cd0 100644 (file)
@@ -264,7 +264,8 @@ USBDevice *usbdevice_create(const char *cmdline)
     USBBus *bus = usb_bus_find(-1 /* any */);
     DeviceInfo *info;
     USBDeviceInfo *usb;
-    char driver[32], *params;
+    char driver[32];
+    const char *params;
     int len;
 
     params = strchr(cmdline,':');
@@ -275,6 +276,7 @@ USBDevice *usbdevice_create(const char *cmdline)
             len = sizeof(driver);
         pstrcpy(driver, len, cmdline);
     } else {
+        params = "";
         pstrcpy(driver, sizeof(driver), cmdline);
     }