From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vdsyg-0007e3-CA for qemu-devel@nongnu.org; Tue, 05 Nov 2013 21:36:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdsyW-0002gg-9X for qemu-devel@nongnu.org; Tue, 05 Nov 2013 21:36:18 -0500 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:49194) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdsyV-0002fU-Mo for qemu-devel@nongnu.org; Tue, 05 Nov 2013 21:36:08 -0500 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 6 Nov 2013 08:05:59 +0530 From: Wenchao Xia Date: Wed, 6 Nov 2013 02:35:50 +0800 Message-Id: <1383676551-18806-2-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1383676551-18806-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1383676551-18806-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH for-1.7 1/2] qapi: fix memleak by adding implict struct functions in dealloc visitor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Wenchao Xia , mdroth@linux.vnet.ibm.com, qemu-stable@nongnu.org Otherwise member "base" is leaked in a qapi_free_STRUCTURE() call. Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake Cc: qemu-stable@nongnu.org --- qapi/qapi-dealloc-visitor.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index 1334de3..dc53545 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -76,6 +76,24 @@ static void qapi_dealloc_end_struct(Visitor *v, Error **errp) } } +static void qapi_dealloc_start_implicit_struct(Visitor *v, + void **obj, + size_t size, + Error **errp) +{ + QapiDeallocVisitor *qov = to_qov(v); + qapi_dealloc_push(qov, obj); +} + +static void qapi_dealloc_end_implicit_struct(Visitor *v, Error **errp) +{ + QapiDeallocVisitor *qov = to_qov(v); + void **obj = qapi_dealloc_pop(qov); + if (obj) { + g_free(*obj); + } +} + static void qapi_dealloc_start_list(Visitor *v, const char *name, Error **errp) { QapiDeallocVisitor *qov = to_qov(v); @@ -162,6 +180,8 @@ QapiDeallocVisitor *qapi_dealloc_visitor_new(void) v->visitor.start_struct = qapi_dealloc_start_struct; v->visitor.end_struct = qapi_dealloc_end_struct; + v->visitor.start_implicit_struct = qapi_dealloc_start_implicit_struct; + v->visitor.end_implicit_struct = qapi_dealloc_end_implicit_struct; v->visitor.start_list = qapi_dealloc_start_list; v->visitor.next_list = qapi_dealloc_next_list; v->visitor.end_list = qapi_dealloc_end_list; -- 1.7.1