From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCVOW-0000vF-CB for qemu-devel@nongnu.org; Tue, 27 Mar 2012 08:21:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCVOQ-0000Jj-Qu for qemu-devel@nongnu.org; Tue, 27 Mar 2012 08:20:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1941) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCVOQ-0000JH-JB for qemu-devel@nongnu.org; Tue, 27 Mar 2012 08:20:54 -0400 From: Luiz Capitulino Date: Tue, 27 Mar 2012 09:20:43 -0300 Message-Id: <1332850851-4059-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1332850851-4059-1-git-send-email-lcapitulino@redhat.com> References: <1332850851-4059-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 05/13] qapi: fix memory leak on error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: Paolo Bonzini , qemu-devel@nongnu.org From: Paolo Bonzini QmpInputVisitor would leak the malloced struct if the stack was overflowed. This can be easily fixed using error_propagate. Signed-off-by: Paolo Bonzini Reviewed-by: Anthony Liguori Signed-off-by: Luiz Capitulino --- qapi/qmp-input-visitor.c | 6 ++++-- 1 file 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.2.384.g4a92a