[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [STABLE 2/3] Avoid crash on '-usbdevice <device>' without p
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [STABLE 2/3] Avoid crash on '-usbdevice <device>' without parameters |
Date: |
Wed, 2 Jun 2010 17:19:55 -0300 |
From: Jan Kiszka <address@hidden>
Many usbdevice_init implementors assume params is non-NULL.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from commit 702f3e0fb52c124c07f215426eeadb70a716643f)
---
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 7c82314..3bb8986 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);
}
--
1.7.1.231.gd0b16