From patchwork Sat Sep 1 10:52:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 181129 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1A00E2C007C for ; Sat, 1 Sep 2012 20:53:11 +1000 (EST) Received: from localhost ([::1]:52038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7lK9-0001w1-8o for incoming@patchwork.ozlabs.org; Sat, 01 Sep 2012 06:53:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7lK2-0001vv-HH for qemu-devel@nongnu.org; Sat, 01 Sep 2012 06:53:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T7lK1-0006H5-Gz for qemu-devel@nongnu.org; Sat, 01 Sep 2012 06:53:02 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:37176) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7lK1-0006H1-Aw; Sat, 01 Sep 2012 06:53:01 -0400 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id 96C587280021; Sat, 1 Sep 2012 12:53:00 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6q065GyFRrmK; Sat, 1 Sep 2012 12:53:00 +0200 (CEST) Received: by v220110690675601.yourvserver.net (Postfix, from userid 1000) id F163B728002B; Sat, 1 Sep 2012 12:52:59 +0200 (CEST) From: Stefan Weil To: Anthony Liguori Date: Sat, 1 Sep 2012 12:52:58 +0200 Message-Id: <1346496778-15014-1-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 1.7.10 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 78.47.199.172 Cc: qemu-trivial@nongnu.org, Stefan Weil , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] json-parser: Fix potential NULL pointer segfault 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 Report from smatch: json-parser.c:474 parse_object(62) error: potential null derefence 'dict'. json-parser.c:553 parse_array(75) error: potential null derefence 'list'. Label out can be called with list == NULL. Signed-off-by: Stefan Weil --- json-parser.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/json-parser.c b/json-parser.c index 457291b..c31c759 100644 --- a/json-parser.c +++ b/json-parser.c @@ -471,7 +471,9 @@ static QObject *parse_object(JSONParserContext *ctxt, va_list *ap) out: parser_context_restore(ctxt, saved_ctxt); - QDECREF(dict); + if (dict) { + QDECREF(dict); + } return NULL; } @@ -550,7 +552,9 @@ static QObject *parse_array(JSONParserContext *ctxt, va_list *ap) out: parser_context_restore(ctxt, saved_ctxt); - QDECREF(list); + if (list) { + QDECREF(list); + } return NULL; }