aboutsummaryrefslogtreecommitdiff
path: root/qom
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2014-03-04 15:28:18 +0100
committerAndreas Färber <afaerber@suse.de>2014-03-12 20:13:02 +0100
commita01aedc8d32e6f5b08a4041b62be3c5fab7a3382 (patch)
tree747d980eee9fa1cc567ede14ed208c4685359593 /qom
parent7b0309490cb108d881a0c66d6b350b4db7b3b4ac (diff)
downloadqemu-a01aedc8d32e6f5b08a4041b62be3c5fab7a3382.zip
qemu-a01aedc8d32e6f5b08a4041b62be3c5fab7a3382.tar.gz
qemu-a01aedc8d32e6f5b08a4041b62be3c5fab7a3382.tar.bz2
qom: Avoid leaking str and bool properties on failure
When object_property_add_str() and object_property_add_bool() fail, they leak their internal StringProperty and BoolProperty structs. Remember to free the structs on error. Luckily this is a low-impact memory leak since most QOM properties are static qdev properties that will never take the error case. object_property_add() only fails if the property name is already in use. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Cc: qemu-stable@nongnu.org Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'qom')
-rw-r--r--qom/object.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/qom/object.c b/qom/object.c
index 660859c..c88909c 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1293,6 +1293,7 @@ void object_property_add_str(Object *obj, const char *name,
void (*set)(Object *, const char *, Error **),
Error **errp)
{
+ Error *local_err = NULL;
StringProperty *prop = g_malloc0(sizeof(*prop));
prop->get = get;
@@ -1302,7 +1303,11 @@ void object_property_add_str(Object *obj, const char *name,
get ? property_get_str : NULL,
set ? property_set_str : NULL,
property_release_str,
- prop, errp);
+ prop, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ g_free(prop);
+ }
}
typedef struct BoolProperty
@@ -1349,6 +1354,7 @@ void object_property_add_bool(Object *obj, const char *name,
void (*set)(Object *, bool, Error **),
Error **errp)
{
+ Error *local_err = NULL;
BoolProperty *prop = g_malloc0(sizeof(*prop));
prop->get = get;
@@ -1358,7 +1364,11 @@ void object_property_add_bool(Object *obj, const char *name,
get ? property_get_bool : NULL,
set ? property_set_bool : NULL,
property_release_bool,
- prop, errp);
+ prop, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ g_free(prop);
+ }
}
static char *qdev_get_type(Object *obj, Error **errp)