From patchwork Wed May 7 14:42:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 346674 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8A8951401A9 for ; Thu, 8 May 2014 00:44:43 +1000 (EST) Received: from localhost ([::1]:41737 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi35N-0004P0-Hr for incoming@patchwork.ozlabs.org; Wed, 07 May 2014 10:44:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi351-00045u-S7 for qemu-devel@nongnu.org; Wed, 07 May 2014 10:44:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wi34v-0008Fs-OQ for qemu-devel@nongnu.org; Wed, 07 May 2014 10:44:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7362) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi34v-0008Fn-He; Wed, 07 May 2014 10:44:13 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s47Ehh4m002270 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 7 May 2014 10:43:43 -0400 Received: from localhost.localdomain.com (vpn1-7-56.ams2.redhat.com [10.36.7.56]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s47EgmTf032294; Wed, 7 May 2014 10:43:27 -0400 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Wed, 7 May 2014 17:42:58 +0300 Message-Id: <1399473780-20374-3-git-send-email-marcel.a@redhat.com> In-Reply-To: <1399473780-20374-1-git-send-email-marcel.a@redhat.com> References: <1399473780-20374-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: mst@redhat.com, aik@ozlabs.ru, lcapitulino@redhat.com, blauwirbel@gmail.com, jcmvbkbc@gmail.com, edgar.iglesias@gmail.com, gxt@mprc.pku.edu.cn, proljc@gmail.com, agraf@suse.de, lersek@redhat.com, scottwood@freescale.com, borntraeger@de.ibm.com, hpoussin@reactos.org, aliguori@amazon.com, mdroth@linux.vnet.ibm.com, chouteau@adacore.com, jan.kiszka@web.de, stefanha@redhat.com, pbonzini@redhat.com, cornelia.huck@de.ibm.com, peter.crosthwaite@xilinx.com, mark.langsdorf@calxeda.com, armbru@redhat.com, michael@walle.cc, qemu-ppc@nongnu.org, peter.chubb@nicta.com.au, afaerber@suse.de, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 2/4] qapi: output visitor crashes qemu if it encounters a NULL value 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 A NULL value is not added to visitor's stack, but there is no check for that when the visitor tries to return that value, leading to Qemu crash. Reviewed-by: Eric Blake Signed-off-by: Marcel Apfelbaum Acked-by: Luiz Capitulino --- qapi/qmp-output-visitor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c index 74a5684..0562f49 100644 --- a/qapi/qmp-output-visitor.c +++ b/qapi/qmp-output-visitor.c @@ -66,6 +66,11 @@ static QObject *qmp_output_pop(QmpOutputVisitor *qov) static QObject *qmp_output_first(QmpOutputVisitor *qov) { QStackEntry *e = QTAILQ_LAST(&qov->stack, QStack); + + if (!e) { + return NULL; + } + return e->value; }