From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: akong@redhat.com, lersek@redhat.com, lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH 05/10] qapi: fix leak in unit tests
Date: Thu, 9 May 2013 21:20:57 -0500 [thread overview]
Message-ID: <1368152462-13219-6-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1368152462-13219-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
next prev parent reply other threads:[~2013-05-10 2:23 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-10 2:20 [Qemu-devel] [PATCH v2 00/10] qapi: add support for lists of native types Michael Roth
2013-05-10 2:20 ` [Qemu-devel] [PATCH 01/10] qapi: qapi-types.py, native list support Michael Roth
2013-05-10 3:04 ` Amos Kong
2013-05-10 11:32 ` mdroth
2013-05-10 14:07 ` Luiz Capitulino
2013-05-10 15:51 ` mdroth
2013-05-10 2:20 ` [Qemu-devel] [PATCH 02/10] qapi: qapi-visit.py, fix list handling for union types Michael Roth
2013-05-10 2:20 ` [Qemu-devel] [PATCH 03/10] qapi: qapi-visit.py, native list support Michael Roth
2013-05-10 2:20 ` [Qemu-devel] [PATCH 04/10] qapi: enable generation of native list code Michael Roth
2013-05-10 14:10 ` Luiz Capitulino
2013-05-10 16:32 ` mdroth
2013-05-10 22:28 ` mdroth
2013-05-10 2:20 ` Michael Roth [this message]
2013-05-10 15:14 ` [Qemu-devel] [PATCH 05/10] qapi: fix leak in unit tests Luiz Capitulino
2013-05-10 2:20 ` [Qemu-devel] [PATCH 06/10] json-parser: fix handling of large whole number values Michael Roth
2013-05-10 11:55 ` Laszlo Ersek
2013-05-10 12:22 ` Eric Blake
2013-05-10 12:47 ` Laszlo Ersek
2013-05-10 13:30 ` mdroth
2013-05-10 14:08 ` Eric Blake
2013-05-10 14:51 ` mdroth
2013-05-10 15:17 ` Luiz Capitulino
2013-05-10 16:00 ` mdroth
2013-05-10 2:20 ` [Qemu-devel] [PATCH 07/10] qapi: fix visitor serialization tests for numbers/doubles Michael Roth
2013-05-10 2:21 ` [Qemu-devel] [PATCH 08/10] qapi: add native list coverage for visitor serialization tests Michael Roth
2013-05-10 2:21 ` [Qemu-devel] [PATCH 09/10] qapi: add native list coverage for QMP output visitor tests Michael Roth
2013-05-10 2:21 ` [Qemu-devel] [PATCH 10/10] qapi: add native list coverage for QMP input " Michael Roth
2013-05-10 15:30 ` [Qemu-devel] [PATCH v2 00/10] qapi: add support for lists of native types Luiz Capitulino
2013-05-10 15:40 ` Laszlo Ersek
2013-05-10 15:43 ` Luiz Capitulino
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=1368152462-13219-6-git-send-email-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=akong@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=lersek@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).