david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdev: Fix memory leak

Browse Source 
The str allocated in visit_type_str was not freed.

The visit_type_str function is an input visitor(<QMP/String/etc>-to-native)
here, it will allocate memory for caller, so the caller is responsible for
freeing the memory.

Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: dunrong huang <riegamaths@gmail.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
dunrong huang 2012-05-18 19:14:13 +08:00 committed by Anthony Liguori
parent 2a633c461e
commit a340046614
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/qdev-properties.c
View File

@ -753,10 +753,12 @@ static void set_mac(Object *obj, Visitor *v, void *opaque,
} }
mac->a[i] = strtol(str+pos, &p, 16); mac->a[i] = strtol(str+pos, &p, 16);
} }
g_free(str);
return; return;
inval: inval:
error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str); error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str);
g_free(str);
} }
PropertyInfo qdev_prop_macaddr = { PropertyInfo qdev_prop_macaddr = {
@ -825,7 +827,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque,
uint32_t *ptr = qdev_get_prop_ptr(dev, prop); uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
unsigned int slot, fn, n; unsigned int slot, fn, n;
Error *local_err = NULL; Error *local_err = NULL;
char *str = (char *)""; char *str;
if (dev->state != DEV_STATE_CREATED) { if (dev->state != DEV_STATE_CREATED) {
error_set(errp, QERR_PERMISSION_DENIED); error_set(errp, QERR_PERMISSION_DENIED);
@ -848,10 +850,12 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque,
goto invalid; goto invalid;
} }
*ptr = slot << 3 | fn; *ptr = slot << 3 | fn;
g_free(str);
return; return;
invalid: invalid:
error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str); error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str);
g_free(str);
} }
static int print_pci_devfn(DeviceState *dev, Property *prop, char *dest, size_t len) static int print_pci_devfn(DeviceState *dev, Property *prop, char *dest, size_t len)