From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WK689-0004Hg-LH for qemu-devel@nongnu.org; Sun, 02 Mar 2014 08:08:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WK682-00014R-Ni for qemu-devel@nongnu.org; Sun, 02 Mar 2014 08:08:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WK682-00014J-B0 for qemu-devel@nongnu.org; Sun, 02 Mar 2014 08:08:26 -0500 From: Marcel Apfelbaum Date: Sun, 2 Mar 2014 15:07:08 +0200 Message-Id: <1393765632-2753-6-git-send-email-marcel.a@redhat.com> In-Reply-To: <1393765632-2753-1-git-send-email-marcel.a@redhat.com> References: <1393765632-2753-1-git-send-email-marcel.a@redhat.com> Subject: [Qemu-devel] [PATCH RFC V2 5/9] qapi: output visitor crashes qemu if it encounters a NULL value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, blauwirbel@gmail.com, mdroth@linux.vnet.ibm.com, mst@redhat.com, armbru@redhat.com, mtosatti@redhat.com, agraf@suse.de, ehabkost@redhat.com, lcapitulino@redhat.com, peter.crosthwaite@petalogix.com, quintela@redhat.com, imammedo@redhat.com, aliguori@amazon.com, pbonzini@redhat.com, scottwood@freescale.com, edgar.iglesias@gmail.com, afaerber@suse.de, rth@twiddle.net 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 --- 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; } -- 1.8.3.1