From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mq3w9-0006Tb-G1 for qemu-devel@nongnu.org; Tue, 22 Sep 2009 07:53:37 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mq3w4-0006Rd-Lg for qemu-devel@nongnu.org; Tue, 22 Sep 2009 07:53:36 -0400 Received: from [199.232.76.173] (port=37782 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mq3w4-0006RM-3M for qemu-devel@nongnu.org; Tue, 22 Sep 2009 07:53:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43793) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mq3w2-00060o-Va for qemu-devel@nongnu.org; Tue, 22 Sep 2009 07:53:31 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8MBrQ2h026129 for ; Tue, 22 Sep 2009 07:53:27 -0400 From: Gerd Hoffmann Date: Tue, 22 Sep 2009 13:53:20 +0200 Message-Id: <1253620402-18682-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1253620402-18682-1-git-send-email-kraxel@redhat.com> References: <1253620402-18682-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 3/5] qdev: don't crash on unset drive properties. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/qdev-properties.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 2ecb58d..edacf35 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -180,7 +180,7 @@ static int parse_drive(DeviceState *dev, Property *prop, const char *str) static int print_drive(DeviceState *dev, Property *prop, char *dest, size_t len) { DriveInfo **ptr = qdev_get_prop_ptr(dev, prop); - return snprintf(dest, len, "%s", (*ptr)->id); + return snprintf(dest, len, "%s", (*ptr) ? (*ptr)->id : ""); } PropertyInfo qdev_prop_drive = { -- 1.6.2.5