Fix some memory leaks in test-visitor-serialization
PATCH v3 1/1 Fix some memory leaks in test-visitor-serialization
This patch fixes some of the memory leaks in test-visitor-serialization but not all of them.
---
v2->v3: repost
v1->v2: call qobject_decref(obj) earlier
--- tests/test-visitor-serialization.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
tests/test-visitor-serialization.c +11 -1
@@ -258,6 +258,7 @@ static void test_primitives(gconstpointeg_assert (pt_copy !=NULL );if (pt->type ==PTYPE_STRING ) { g_assert_cmpstr(pt->value.string, ==, pt_copy->value.string); +g_free ((char *)pt_copy->value.string); }else if (pt->type ==PTYPE_NUMBER ) {/* we serialize with %f for our reference visitors, so rather than fuzzy * floating math to test "equality", just compare the formatted values
@@ -275,6 +276,7 @@ static void test_primitives(gconstpointe ops->cleanup (serialize_data);g_free (args); +g_free (pt_copy); }static void test_struct (gconstpointer opaque)
@@ -660,6 +662,7 @@ static void qmp_deserialize(void **nativQDECREF (output_json); d->qiv =qmp_input_visitor_new (obj); +qobject_decref (obj);visit (qmp_input_get_visitor (d->qiv), native_out, errp); }
@@ -668,9 +671,12 @@ static void qmp_cleanup(void *datap)QmpSerializeData *d = datap;qmp_output_visitor_cleanup (d->qov);qmp_input_visitor_cleanup (d->qiv); + +g_free (d); }typedef struct StringSerializeData { +char *string;StringOutputVisitor *sov;StringInputVisitor *siv; }StringSerializeData ;
@@ -690,15 +696,19 @@ static void string_deserialize(void **na {StringSerializeData *d = datap; - d->siv =string_input_visitor_new (string_output_get_string (d->sov)); + d->string =string_output_get_string (d->sov); + d->siv =string_input_visitor_new (d->string);visit (string_input_get_visitor (d->siv), native_out, errp); }static void string_cleanup (void *datap) {StringSerializeData *d = datap; +string_output_visitor_cleanup (d->sov);string_input_visitor_cleanup (d->siv); +g_free (d->string); +g_free (d); }/* visitor registration, test harness */
Stefan Hajnoczi
AppliedQuoted 4 lines · Stefan Berger
This patch fixes some of the memory leaks in test-visitor-serialization but not all of them.
Signed-off-by Stefan Berger <[email protected]>
Quoted 8 lines
---
v2->v3: repost
v1->v2: callqobject_decref(obj)earlier--- tests/test-visitor-serialization.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
Thanks, applied to the trivial patches -next tree:
https://github.com/stefanha/qemu/commits/trivial-patches-next
Stefan
Quoted 10 lines · Stefan Hajnoczi
Quoted 9 lines · Stefan Berger
This patch fixes some of the memory leaks in test-visitor-serialization but not all of them.
Signed-off-by Stefan Berger <[email protected]>---
v2->v3: repost
v1->v2: callqobject_decref(obj)earlier
Quoted 8 lines
Quoted 3 lines
--- tests/test-visitor-serialization.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)Thanks, applied to the trivial patches -next tree:
https://github.com/stefanha/qemu/commits/trivial-patches-nextStefan
Great. There are some left-over leaks that I couldn't figure out how to fix. Someone more familiar with the qmp code may want to look at them.