[Qemu-devel] [PATCH v2] qom: Fix memory leak in object_property_set_link()

[Qemu-devel] [PATCH v2] qom: Fix memory leak in object_property_set_link()

[Vlad Yasevich]

Save the result of the call to object_get_cannonical_path()
so we can free it.

Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
---
v1->v2:  Builds and works :)

 qom/object.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qom/object.c b/qom/object.c
index b617f26..fc19cf6 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -838,8 +838,9 @@ char *object_property_get_str(Object *obj, const char *name,
 void object_property_set_link(Object *obj, Object *value,
                               const char *name, Error **errp)
 {
-    object_property_set_str(obj, object_get_canonical_path(value),
-                            name, errp);
+    gchar *path = object_get_canonical_path(value);
+    object_property_set_str(obj, path, name, errp);
+    g_free(path);
 }
 
 Object *object_property_get_link(Object *obj, const char *name,
-- 
1.8.4.2

Re: [Qemu-devel] [PATCH v2] qom: Fix memory leak in object_property_set_link()

[Amos Kong]

On Fri, Nov 15, 2013 at 12:09:47PM -0500, Vlad Yasevich wrote:
> Save the result of the call to object_get_cannonical_path()
> so we can free it.
> 
> Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
> ---
> v1->v2:  Builds and works :)
> 
>  qom/object.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/qom/object.c b/qom/object.c
> index b617f26..fc19cf6 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -838,8 +838,9 @@ char *object_property_get_str(Object *obj, const char *name,
>  void object_property_set_link(Object *obj, Object *value,
>                                const char *name, Error **errp)
>  {
> -    object_property_set_str(obj, object_get_canonical_path(value),
> -                            name, errp);
> +    gchar *path = object_get_canonical_path(value);
> +    object_property_set_str(obj, path, name, errp);
> +    g_free(path);

Reviewed-by: Amos Kong <akong@redhat.com>

>  }
>  
>  Object *object_property_get_link(Object *obj, const char *name,
> -- 
> 1.8.4.2
> 

-- 
			Amos.

Re: [Qemu-devel] [PATCH v2 for-1.7] qom: Fix memory leak in object_property_set_link()

[Andreas Färber]

Am 15.11.2013 18:09, schrieb Vlad Yasevich:
> Save the result of the call to object_get_cannonical_path()
> so we can free it.
> 
> Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>

Cc: qemu-stable@nongnu.org
Reviewed-by: Andreas Färber <afaerber@suse.de>

in case Anthony wants to pick it up himself, and queued on qom-next:
https://github.com/afaerber/qemu-cpu/commits/qom-next

It looks as if Stefan posted an identical patch with for-1.7 tag but
with his From.

Regards,
Andreas

> ---
> v1->v2:  Builds and works :)
> 
>  qom/object.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/qom/object.c b/qom/object.c
> index b617f26..fc19cf6 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -838,8 +838,9 @@ char *object_property_get_str(Object *obj, const char *name,
>  void object_property_set_link(Object *obj, Object *value,
>                                const char *name, Error **errp)
>  {
> -    object_property_set_str(obj, object_get_canonical_path(value),
> -                            name, errp);
> +    gchar *path = object_get_canonical_path(value);
> +    object_property_set_str(obj, path, name, errp);
> +    g_free(path);
>  }
>  
>  Object *object_property_get_link(Object *obj, const char *name,
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH v2 for-1.7] qom: Fix memory leak in object_property_set_link()

[Stefan Hajnoczi]

On Mon, Nov 18, 2013 at 04:52:02PM +0100, Andreas Färber wrote:
> Am 15.11.2013 18:09, schrieb Vlad Yasevich:
> > Save the result of the call to object_get_cannonical_path()
> > so we can free it.
> > 
> > Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
> 
> Cc: qemu-stable@nongnu.org
> Reviewed-by: Andreas Färber <afaerber@suse.de>
> 
> in case Anthony wants to pick it up himself, and queued on qom-next:
> https://github.com/afaerber/qemu-cpu/commits/qom-next
> 
> It looks as if Stefan posted an identical patch with for-1.7 tag but
> with his From.

Please merge Vlad's patch.

I wrote mine independently because I hadn't read Vlad's email yet.

Stefan