From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKbhv-0006cH-2J for qemu-devel@nongnu.org; Tue, 26 Mar 2013 17:47:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKbht-00055Z-JR for qemu-devel@nongnu.org; Tue, 26 Mar 2013 17:47:02 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:40828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKbht-000558-F8 for qemu-devel@nongnu.org; Tue, 26 Mar 2013 17:47:01 -0400 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 26 Mar 2013 17:46:58 -0400 Message-ID: <5152174F.6080908@linux.vnet.ibm.com> Date: Tue, 26 Mar 2013 17:46:55 -0400 From: Stefan Berger MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] Fix some memory leaks in test-visitor-serialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-trivial@nongnu.org, Michael Roth Cc: qemu-devel This patch fixes some of the memory leaks in test-visitor-serialization but not all of them. Signed-off-by: Stefan Berger --- tests/test-visitor-serialization.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) Index: qemu-git.pt/tests/test-visitor-serialization.c =================================================================== --- qemu-git.pt.orig/tests/test-visitor-serialization.c +++ qemu-git.pt/tests/test-visitor-serialization.c @@ -258,6 +258,7 @@ static void test_primitives(gconstpointe g_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) @@ -637,6 +639,7 @@ PrimitiveType pt_values[] = { /* visitor-specific op implementations */ typedef struct QmpSerializeData { + QObject *obj; QmpOutputVisitor *qov; QmpInputVisitor *qiv; } QmpSerializeData; @@ -656,10 +659,10 @@ static void qmp_deserialize(void **nativ { QmpSerializeData *d = datap; QString *output_json = qobject_to_json(qmp_output_get_qobject(d->qov)); - QObject *obj = qobject_from_json(qstring_get_str(output_json)); + d->obj = qobject_from_json(qstring_get_str(output_json)); QDECREF(output_json); - d->qiv = qmp_input_visitor_new(obj); + d->qiv = qmp_input_visitor_new(d->obj); visit(qmp_input_get_visitor(d->qiv), native_out, errp); } @@ -668,9 +671,13 @@ static void qmp_cleanup(void *datap) QmpSerializeData *d = datap; qmp_output_visitor_cleanup(d->qov); qmp_input_visitor_cleanup(d->qiv); + qobject_decref(d->obj); + + g_free(d); } typedef struct StringSerializeData { + char *string; StringOutputVisitor *sov; StringInputVisitor *siv; } StringSerializeData; @@ -690,15 +697,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 */