diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-11-19 13:00:09 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-11-19 13:00:09 -0800 |
| commit | 1c46e594dc3eb0df4bdc1ea31b61c19ee0eed753 (patch) | |
| tree | 9fd4edc5baa31d45d1564d633ab06e48b4c6113e | |
| parent | dc6dc0a9879738236b4da03d34d3c72eedfd25bb (diff) | |
| parent | 2d3aa28cc2cf382aa04cd577e0be542175eea9bd (diff) | |
Merge remote-tracking branch 'afaerber/tags/qom-devices-for-anthony' into staging
QOM infrastructure fixes for 1.7
* QOM memory leak fix
# gpg: Signature made Tue 19 Nov 2013 01:58:58 AM PST using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found
# By Vlad Yasevich
# Via Andreas Färber
* afaerber/tags/qom-devices-for-anthony:
qom: Fix memory leak in object_property_set_link()
| -rw-r--r-- | qom/object.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qom/object.c b/qom/object.c index b617f265e7..fc19cf676a 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, |