qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: akong@redhat.com, lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH 5/8] qapi: fix leak in unit tests
Date: Wed,  8 May 2013 18:33:54 -0500	[thread overview]
Message-ID: <1368056037-16350-6-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1368056037-16350-1-git-send-email-mdroth@linux.vnet.ibm.com>

qmp_output_get_qobject() increments the qobject's reference count. Since
we currently pass this straight into qobject_to_json() so we can feed
the data into a QMP input visitor, we never actually free the underlying
qobject when qmp_output_visitor_cleanup() is called. This causes leaks
on all of the QMP serialization tests.

Fix this by holding a pointer to the qobject and decref'ing it before
returning from qmp_deserialize().

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 tests/test-visitor-serialization.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c
index e84926f..8c8adac 100644
--- a/tests/test-visitor-serialization.c
+++ b/tests/test-visitor-serialization.c
@@ -657,11 +657,16 @@ static void qmp_deserialize(void **native_out, void *datap,
                             VisitorFunc visit, Error **errp)
 {
     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));
+    QString *output_json;
+    QObject *obj_orig, *obj;
+
+    obj_orig = qmp_output_get_qobject(d->qov);
+    output_json = qobject_to_json(obj_orig);
+    obj = qobject_from_json(qstring_get_str(output_json));
 
     QDECREF(output_json);
     d->qiv = qmp_input_visitor_new(obj);
+    qobject_decref(obj_orig);
     qobject_decref(obj);
     visit(qmp_input_get_visitor(d->qiv), native_out, errp);
 }
-- 
1.7.9.5

  parent reply	other threads:[~2013-05-08 23:35 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-08 23:33 [Qemu-devel] [PATCH 0/8] qapi: add support for lists of native types Michael Roth
2013-05-08 23:33 ` [Qemu-devel] [PATCH 1/8] qapi: qapi-types.py, native list support Michael Roth
2013-05-08 23:33 ` [Qemu-devel] [PATCH 2/8] qapi: qapi-visit.py, fix list handling for union types Michael Roth
2013-05-08 23:33 ` [Qemu-devel] [PATCH 3/8] qapi: qapi-visit.py, native list support Michael Roth
2013-05-08 23:33 ` [Qemu-devel] [PATCH 4/8] qapi: enable generation of native list code Michael Roth
2013-05-08 23:33 ` Michael Roth [this message]
2013-05-08 23:33 ` [Qemu-devel] [PATCH 6/8] qapi: add native list coverage for visitor serialization tests Michael Roth
2013-05-09 12:31   ` Laszlo Ersek
2013-05-09 13:32     ` mdroth
2013-05-08 23:33 ` [Qemu-devel] [PATCH 7/8] qapi: add native list coverage for QMP output visitor tests Michael Roth
2013-05-08 23:33 ` [Qemu-devel] [PATCH 8/8] qapi: add native list coverage for QMP input " Michael Roth
2013-05-09 13:31 ` [Qemu-devel] [PATCH 0/8] qapi: add support for lists of native types Laszlo Ersek
2013-05-09 13:49   ` mdroth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1368056037-16350-6-git-send-email-mdroth@linux.vnet.ibm.com \
    --to=mdroth@linux.vnet.ibm.com \
    --cc=akong@redhat.com \
    --cc=lcapitulino@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).