diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-09-04 13:33:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-09-04 13:33:53 +0100 |
| commit | 01eb313907dda97313b8fea62e5632fca64f069c (patch) | |
| tree | 16512809a4e1e08b5324d3a5f1e610533f1c32db /qom | |
| parent | b27e37d4ce4e9951afbb9280bb1416c13f562295 (diff) | |
| parent | 70381662aa97b294f3c81a085ed143f37f0ab0cb (diff) | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-09-03' into staging
trivial patches for 2014-09-03
# gpg: Signature made Wed 03 Sep 2014 06:53:42 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514 66A7 BEE5 9D74 A4C3 D7DB
* remotes/mjt/tags/trivial-patches-2014-09-03:
slirp: Honour vlan/stack in hostfwd_remove commands
hmp: fix MemdevList memory leak
qom/object.c, hmp.c: fix string_output_get_string() memory leak
query-memdev: fix potential memory leaks
MAINTAINERS: Add VMWare devices maintainer
device_tree.c: dump all err mesages with error_report
device_tree.c: redirect load_device_tree err message to stderr
scripts: Remove scripts/qtest
Fix debug print warning
curl: The macro that you have to uncomment to get debugging is DEBUG_CURL.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qom')
| -rw-r--r-- | qom/object.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/qom/object.c b/qom/object.c index 1b00831efc..79bd0cc474 100644 --- a/qom/object.c +++ b/qom/object.c @@ -938,14 +938,18 @@ int object_property_get_enum(Object *obj, const char *name, { StringOutputVisitor *sov; StringInputVisitor *siv; + char *str; int ret; sov = string_output_visitor_new(false); object_property_get(obj, string_output_get_visitor(sov), name, errp); - siv = string_input_visitor_new(string_output_get_string(sov)); + str = string_output_get_string(sov); + siv = string_input_visitor_new(str); string_output_visitor_cleanup(sov); visit_type_enum(string_input_get_visitor(siv), &ret, strings, NULL, name, errp); + + g_free(str); string_input_visitor_cleanup(siv); return ret; @@ -956,13 +960,17 @@ void object_property_get_uint16List(Object *obj, const char *name, { StringOutputVisitor *ov; StringInputVisitor *iv; + char *str; ov = string_output_visitor_new(false); object_property_get(obj, string_output_get_visitor(ov), name, errp); - iv = string_input_visitor_new(string_output_get_string(ov)); + str = string_output_get_string(ov); + iv = string_input_visitor_new(str); visit_type_uint16List(string_input_get_visitor(iv), list, NULL, errp); + + g_free(str); string_output_visitor_cleanup(ov); string_input_visitor_cleanup(iv); } |