From patchwork Mon May 26 12:40:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 352506 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CC7B31400C6 for ; Mon, 26 May 2014 22:42:54 +1000 (EST) Received: from localhost ([::1]:56577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WouEu-00048x-Gh for incoming@patchwork.ozlabs.org; Mon, 26 May 2014 08:42:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WouDO-0000eX-N2 for qemu-devel@nongnu.org; Mon, 26 May 2014 08:41:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WouDE-0003jP-6d for qemu-devel@nongnu.org; Mon, 26 May 2014 08:41:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WouDD-0003jA-UK for qemu-devel@nongnu.org; Mon, 26 May 2014 08:41:08 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4QCf5bT006255 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 26 May 2014 08:41:05 -0400 Received: from localhost.localdomain.com (vpn1-4-42.ams2.redhat.com [10.36.4.42]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s4QCeiCl003889; Mon, 26 May 2014 08:40:57 -0400 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Mon, 26 May 2014 15:40:55 +0300 Message-Id: <1401108058-27348-2-git-send-email-marcel.a@redhat.com> In-Reply-To: <1401108058-27348-1-git-send-email-marcel.a@redhat.com> References: <1401108058-27348-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: mst@redhat.com, armbru@redhat.com, marcel.a@redhat.com, agraf@suse.de, mdroth@linux.vnet.ibm.com, aliguori@amazon.com, sw@weilnetz.de, lcapitulino@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH V2 1/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 Acked-by: Luiz Capitulino Signed-off-by: Marcel Apfelbaum --- qapi/qmp-output-visitor.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c index 74a5684..96b3384 100644 --- a/qapi/qmp-output-visitor.c +++ b/qapi/qmp-output-visitor.c @@ -66,6 +66,12 @@ static QObject *qmp_output_pop(QmpOutputVisitor *qov) static QObject *qmp_output_first(QmpOutputVisitor *qov) { QStackEntry *e = QTAILQ_LAST(&qov->stack, QStack); + + /* FIXME - find a better way to deal with NULL values */ + if (!e) { + return NULL; + } + return e->value; }