* [Qemu-devel] [PATCH 1.1 v2] qdev: Fix memory leak
@ 2012-05-18 11:14 dunrong huang
2012-05-18 21:20 ` Stefan Weil
0 siblings, 1 reply; 2+ messages in thread
From: dunrong huang @ 2012-05-18 11:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Anthony Liguori, Michael Roth
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.
Signed-off-by: dunrong huang <riegamaths@gmail.com>
---
hw/qdev-properties.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index c5545dc..b7b5597 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -753,10 +753,12 @@ static void set_mac(Object *obj, Visitor *v, void *opaque,
}
mac->a[i] = strtol(str+pos, &p, 16);
}
+ g_free(str);
return;
inval:
error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str);
+ g_free(str);
}
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);
unsigned int slot, fn, n;
Error *local_err = NULL;
- char *str = (char *)"";
+ char *str;
if (dev->state != DEV_STATE_CREATED) {
error_set(errp, QERR_PERMISSION_DENIED);
@@ -848,10 +850,12 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque,
goto invalid;
}
*ptr = slot << 3 | fn;
+ g_free(str);
return;
invalid:
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)
--
1.7.8.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH 1.1 v2] qdev: Fix memory leak
2012-05-18 11:14 [Qemu-devel] [PATCH 1.1 v2] qdev: Fix memory leak dunrong huang
@ 2012-05-18 21:20 ` Stefan Weil
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Weil @ 2012-05-18 21:20 UTC (permalink / raw)
To: dunrong huang; +Cc: Stefan Hajnoczi, Anthony Liguori, qemu-devel, Michael Roth
Am 18.05.2012 13:14, schrieb dunrong huang:
> 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.
>
> Signed-off-by: dunrong huang<riegamaths@gmail.com>
> ---
> hw/qdev-properties.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
> index c5545dc..b7b5597 100644
> --- a/hw/qdev-properties.c
> +++ b/hw/qdev-properties.c
> @@ -753,10 +753,12 @@ static void set_mac(Object *obj, Visitor *v, void *opaque,
> }
> mac->a[i] = strtol(str+pos,&p, 16);
> }
> + g_free(str);
> return;
>
> inval:
> error_set_from_qdev_prop_error(errp, EINVAL, dev, prop, str);
> + g_free(str);
> }
>
> 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);
> unsigned int slot, fn, n;
> Error *local_err = NULL;
> - char *str = (char *)"";
> + char *str;
>
> if (dev->state != DEV_STATE_CREATED) {
> error_set(errp, QERR_PERMISSION_DENIED);
> @@ -848,10 +850,12 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque,
> goto invalid;
> }
> *ptr = slot<< 3 | fn;
> + g_free(str);
> return;
>
> invalid:
> 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)
Reviewed-by: Stefan Weil <sw@weilnetz.de>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-18 21:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-18 11:14 [Qemu-devel] [PATCH 1.1 v2] qdev: Fix memory leak dunrong huang
2012-05-18 21:20 ` Stefan Weil
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.