From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAgYG-0002l9-2U for qemu-devel@nongnu.org; Thu, 22 Mar 2012 07:51:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SAgY8-0004jA-L5 for qemu-devel@nongnu.org; Thu, 22 Mar 2012 07:51:31 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:51249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAgY8-0004iW-Ce for qemu-devel@nongnu.org; Thu, 22 Mar 2012 07:51:24 -0400 Received: by wibhm17 with SMTP id hm17so548529wib.4 for ; Thu, 22 Mar 2012 04:51:22 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 22 Mar 2012 12:51:05 +0100 Message-Id: <1332417072-20329-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1332417072-20329-1-git-send-email-pbonzini@redhat.com> References: <1332417072-20329-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 03/10] qapi: fix memory leak on error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, eblake@redhat.com, anthony@codemonkey.vs, lcapitulino@redhat.com QmpInputVisitor would leak the malloced struct if the stack was overflowed. This can be easily fixed using error_propagate. Signed-off-by: Paolo Bonzini --- qapi/qmp-input-visitor.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c index b4013cc..ef9288f 100644 --- a/qapi/qmp-input-visitor.c +++ b/qapi/qmp-input-visitor.c @@ -86,6 +86,7 @@ static void qmp_input_start_struct(Visitor *v, void **obj, const char *kind, { QmpInputVisitor *qiv = to_qiv(v); const QObject *qobj = qmp_input_get_object(qiv, name); + Error *err = NULL; if (!qobj || qobject_type(qobj) != QTYPE_QDICT) { error_set(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", @@ -93,8 +94,9 @@ static void qmp_input_start_struct(Visitor *v, void **obj, const char *kind, return; } - qmp_input_push(qiv, qobj, errp); - if (error_is_set(errp)) { + qmp_input_push(qiv, qobj, &err); + if (err) { + error_propagate(errp, err); return; } -- 1.7.9.1