diff options
| author | Markus Armbruster <armbru@redhat.com> | 2010-06-01 20:32:31 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-06-04 11:43:39 +0200 |
| commit | d21357df9a2a6b7e6bb2f579d04877f3bd65c557 (patch) | |
| tree | 7397e5342d9c2e51eddfe63b38a13b63d966fb2d /hw/qdev-properties.c | |
| parent | cc98467327e13adca8f65b5a841c08930ee68220 (diff) | |
| download | qemu-d21357df9a2a6b7e6bb2f579d04877f3bd65c557.zip qemu-d21357df9a2a6b7e6bb2f579d04877f3bd65c557.tar.gz qemu-d21357df9a2a6b7e6bb2f579d04877f3bd65c557.tar.bz2 | |
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.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index b6ee50f..48a6b45 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 --- */ |