]> xenbits.xensource.com Git - qemu-upstream-4.4-testing.git/commitdiff
qom: Fix memory leak in object_property_set_link()
authorVlad Yasevich <vyasevic@redhat.com>
Fri, 15 Nov 2013 17:09:47 +0000 (12:09 -0500)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Mon, 9 Dec 2013 17:40:30 +0000 (11:40 -0600)
Save the result of the call to object_get_canonical_path()
so we can free it.

Cc: qemu-stable@nongnu.org
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Reviewed-by: Amos Kong <akong@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
(cherry picked from commit 2d3aa28cc2cf382aa04cd577e0be542175eea9bd)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
qom/object.c

index b2479d1c06f6f77e54e659f923f86a5a6e5be502..333f807d048d38f8d81904fa1d1e90a016d1675f 100644 (file)
@@ -823,8 +823,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,