summary refs log tree commit diff stats
path: root/hw/isa-bus.c
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2012-10-04 13:09:44 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2012-10-05 07:58:36 -0500
commita5cf8262e4eb9c4646434e2c6211ef8608db3233 (patch)
treef77b60c58c43c2c8c079b3166de4b0141a3266dd /hw/isa-bus.c
parenta14c74928ba1fdaada515717f4d3c3fa3275d6f7 (diff)
downloadfocaccia-qemu-a5cf8262e4eb9c4646434e2c6211ef8608db3233.tar.gz
focaccia-qemu-a5cf8262e4eb9c4646434e2c6211ef8608db3233.zip
scsi, pci, qdev, isa-bus, sysbus: don't let *_get_fw_dev_path return NULL
Use g_strdup rather than strdup, because the sole caller
(qdev_get_fw_dev_path_helper) assumes it gets non-NULL, and dereferences
it.  Besides, in that caller, the allocated buffer is already freed with
g_free, so it's better to allocate with a matching g_strdup.

In one case, (scsi-bus.c) it was trivial, so I replaced an snprintf+
g_strdup combination with an equivalent g_strdup_printf use.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/isa-bus.c')
-rw-r--r--hw/isa-bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index f9b237387a..47c93d37b6 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -236,7 +236,7 @@ static char *isabus_get_fw_dev_path(DeviceState *dev)
         snprintf(path + off, sizeof(path) - off, "@%04x", d->ioport_id);
     }
 
-    return strdup(path);
+    return g_strdup(path);
 }
 
 MemoryRegion *isa_address_space(ISADevice *dev)