From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NoETw-0008Up-Qu for qemu-devel@nongnu.org; Sun, 07 Mar 2010 06:17:12 -0500 Received: from [199.232.76.173] (port=41994 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NoETw-0008UP-5t for qemu-devel@nongnu.org; Sun, 07 Mar 2010 06:17:12 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NoETv-0006TO-0R for qemu-devel@nongnu.org; Sun, 07 Mar 2010 06:17:12 -0500 Received: from fmmailgate02.web.de ([217.72.192.227]:57464) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NoETu-0006TE-Jq for qemu-devel@nongnu.org; Sun, 07 Mar 2010 06:17:10 -0500 Message-ID: <4B938B34.60102@web.de> Date: Sun, 07 Mar 2010 12:17:08 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <4B938494.1040100@web.de> In-Reply-To: <4B938494.1040100@web.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH v2] Avoid crash on '-usbdevice ' without parameters List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel Many usbdevice_init implementors assume params is non-NULL. Signed-off-by: Jan Kiszka --- Build fixed - sorry. 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); }