From patchwork Wed May 15 13:39:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 244078 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C77FE2C00A8 for ; Wed, 15 May 2013 23:40:13 +1000 (EST) Received: from localhost ([::1]:36688 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UcbwB-0001ou-MJ for incoming@patchwork.ozlabs.org; Wed, 15 May 2013 09:40:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ucbvm-0001ol-IE for qemu-devel@nongnu.org; Wed, 15 May 2013 09:39:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ucbvk-00078v-PC for qemu-devel@nongnu.org; Wed, 15 May 2013 09:39:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ucbvk-00078d-Hk for qemu-devel@nongnu.org; Wed, 15 May 2013 09:39:44 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4FDdhXe031254 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 15 May 2013 09:39:44 -0400 Received: from localhost (ovpn-113-73.phx2.redhat.com [10.3.113.73]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r4FDdh6K025273; Wed, 15 May 2013 09:39:43 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 15 May 2013 09:39:39 -0400 Message-Id: <1368625179-27962-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1368625179-27962-1-git-send-email-lcapitulino@redhat.com> References: <1368625179-27962-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PULL 2/2] qapi: fix leak in unit tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Michael Roth 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 Signed-off-by: Luiz Capitulino --- 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); }