From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 22 Sep 2009 11:53:20 +0000 (+0200)
Subject: qdev: don't crash on unset drive properties.
X-Git-Tag: v0.12.0-rc0~855
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41b5e892b7dbf553b356b51004a6966233e71a6d;p=thirdparty%2Fqemu.git

qdev: don't crash on unset drive properties.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index c4fb15c0204..5c627fae408 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -208,7 +208,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 : "<null>");
 }
 
 PropertyInfo qdev_prop_drive = {