Skip to contentSkip to conversation

Avoid crash on '-usbdevice <device>' without parameters

PATCH Superseded Jan Kiszka 1 participant 2 messages Mar 7, 2010

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 Avoid crash on '-usbdevice <device>' without parameters

Many usbdevice_init implementors assume params is non-NULL.

---
 hw/usb-bus.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
hw/usb-bus.c +1 -0
index 7c82314..89e2ea6 100644
@@ -275,6 +275,7 @@ USBDevice *usbdevice_create(const char *cmdline)
             len = sizeof(driver);
         pstrcpy(driver, len, cmdline);
     } else {
+        params = "";
         pstrcpy(driver, sizeof(driver), cmdline);
     }
 
author
#1 lore raw

PATCH v2 1/1 Avoid crash on '-usbdevice <device>' without parameters

Many usbdevice_init implementors assume params is non-NULL.

---

Build fixed - sorry.

 hw/usb-bus.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
hw/usb-bus.c +3 -1
index 7c82314..3bb8986 100644
@@ -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);
     }