summary refs log tree commit diff stats
path: root/hw/qdev-properties.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2010-06-01 20:32:31 +0200
committerKevin Wolf <kwolf@redhat.com>2010-06-04 11:43:39 +0200
commitd21357df9a2a6b7e6bb2f579d04877f3bd65c557 (patch)
tree7397e5342d9c2e51eddfe63b38a13b63d966fb2d /hw/qdev-properties.c
parentcc98467327e13adca8f65b5a841c08930ee68220 (diff)
downloadfocaccia-qemu-d21357df9a2a6b7e6bb2f579d04877f3bd65c557.tar.gz
focaccia-qemu-d21357df9a2a6b7e6bb2f579d04877f3bd65c557.zip
qdev: Don't leak string property value on hot unplug
parse_string() qemu_strdup()s the property value.  It is never freed.
It needs to be freed along with the device.  Otherwise, the value of
scsi-disk property "ver" gets leaked when hot-unplugging the disk, for
instance.

Call new PropertyInfo method free() from qdev_free().  Implement it
for qdev_prop_string.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/qdev-properties.c')
-rw-r--r--hw/qdev-properties.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index b6ee50fe2d..48a6b45cda 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -260,6 +260,11 @@ static int parse_string(DeviceState *dev, Property *prop, const char *str)
     return 0;
 }
 
+static void free_string(DeviceState *dev, Property *prop)
+{
+    qemu_free(*(char **)qdev_get_prop_ptr(dev, prop));
+}
+
 static int print_string(DeviceState *dev, Property *prop, char *dest, size_t len)
 {
     char **ptr = qdev_get_prop_ptr(dev, prop);
@@ -274,6 +279,7 @@ PropertyInfo qdev_prop_string = {
     .size  = sizeof(char*),
     .parse = parse_string,
     .print = print_string,
+    .free  = free_string,
 };
 
 /* --- drive --- */