From patchwork Wed Jun 2 20:19:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 54427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8CC68B7D1D for ; Thu, 3 Jun 2010 06:21:23 +1000 (EST) Received: from localhost ([127.0.0.1]:56732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJuRE-0005Lh-Oh for incoming@patchwork.ozlabs.org; Wed, 02 Jun 2010 16:21:20 -0400 Received: from [140.186.70.92] (port=57001 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJuQK-0005H5-Nt for qemu-devel@nongnu.org; Wed, 02 Jun 2010 16:20:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJuQB-0003eK-VR for qemu-devel@nongnu.org; Wed, 02 Jun 2010 16:20:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42353) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJuQB-0003eF-Mm for qemu-devel@nongnu.org; Wed, 02 Jun 2010 16:20:15 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o52KKEsG008831 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 2 Jun 2010 16:20:14 -0400 Received: from localhost (vpn-10-141.rdu.redhat.com [10.11.10.141]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o52KKCda025831; Wed, 2 Jun 2010 16:20:13 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 2 Jun 2010 17:19:55 -0300 Message-Id: <1275509996-25823-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1275509996-25823-1-git-send-email-lcapitulino@redhat.com> References: <1275509996-25823-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Anthony Liguori , Jan Kiszka Subject: [Qemu-devel] [STABLE 2/3] Avoid crash on '-usbdevice ' without parameters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka Many usbdevice_init implementors assume params is non-NULL. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori (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); }