From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:39470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBpz0-0006p0-RZ for qemu-devel@nongnu.org; Mon, 18 Apr 2011 11:03:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QBpyw-0000oa-J4 for qemu-devel@nongnu.org; Mon, 18 Apr 2011 11:03:22 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:59665) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QBpyw-0000oI-DI for qemu-devel@nongnu.org; Mon, 18 Apr 2011 11:03:18 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e33.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p3IEuPCW005681 for ; Mon, 18 Apr 2011 08:56:25 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id p3IF39BK112874 for ; Mon, 18 Apr 2011 09:03:12 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p3IF37qx021946 for ; Mon, 18 Apr 2011 09:03:08 -0600 From: Michael Roth Date: Mon, 18 Apr 2011 10:02:22 -0500 Message-Id: <1303138953-1334-7-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1303138953-1334-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1303138953-1334-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC][PATCH v2 06/17] qapi: fix memory leak for async marshalling code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@linux.vnet.ibm.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, Jes.Sorensen@redhat.com When generating the callback function for an async command, if we expect a QString we copy it into a native char* type, then call the completion function. We should free it after calling the completion function, since the completion function will later copy it into a new QString before adding it to the response object and then passing it on to the wire. Signed-off-by: Michael Roth --- qmp-gen.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/qmp-gen.py b/qmp-gen.py index 4164692..3667ec5 100644 --- a/qmp-gen.py +++ b/qmp-gen.py @@ -349,6 +349,10 @@ static void qmp_%(c_name)s_cb(void *qmp__opaque, QObject *qmp__retval, Error *qm ret += cgen(' qmp__cb->cb(qmp__cb->opaque, qmp__err);') else: ret += cgen(' qmp__cb->cb(qmp__cb->opaque, qmp__native_retval, qmp__err);') + if retval != 'none' and qmp_type_should_free(retval): + ret += cgen(' %(free)s(qmp__native_retval);', + free=qapi_free_func(retval)) + ret += cgen('}') return ret -- 1.7.0.4