diff options
| author |   Jan Kiszka <jan.kiszka@web.de> | 2010-06-02 17:19:55 -0300 |
|---|---|---|
| committer |   Doug Goldstein <cardoe@gentoo.org> | 2010-07-20 17:31:30 -0500 |
| commit | 36b6c1013d11e03d70b0b7e74d2e90fffa8a2d8a (patch) | |
| tree | 95ff0eb54f0240069bef0b24b4a4d7f680acd283 | |
| parent | Fix -usbdevice crash (diff) | |
| download | qemu-kvm-36b6c1013d11e03d70b0b7e74d2e90fffa8a2d8a.tar.gz qemu-kvm-36b6c1013d11e03d70b0b7e74d2e90fffa8a2d8a.tar.bz2 qemu-kvm-36b6c1013d11e03d70b0b7e74d2e90fffa8a2d8a.zip | |
Avoid crash on '-usbdevice <device>' without parameters
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)
| -rw-r--r-- | hw/usb-bus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/usb-bus.c b/hw/usb-bus.c index 7c823147a..3bb89862b 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -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); } |