From patchwork Sat Sep 1 07:30:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 181122 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 8F26E2C007D for ; Sat, 1 Sep 2012 17:30:54 +1000 (EST) Received: from localhost ([::1]:60832 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7iAN-00035s-OE for incoming@patchwork.ozlabs.org; Sat, 01 Sep 2012 03:30:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7iAG-00035k-R9 for qemu-devel@nongnu.org; Sat, 01 Sep 2012 03:30:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T7iAF-0005n4-1A for qemu-devel@nongnu.org; Sat, 01 Sep 2012 03:30:44 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:45217) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7iAE-0005mz-On for qemu-devel@nongnu.org; Sat, 01 Sep 2012 03:30:42 -0400 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id 798167280021; Sat, 1 Sep 2012 09:30:40 +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 l-zdN4mapz5E; Sat, 1 Sep 2012 09:30:39 +0200 (CEST) Received: by v220110690675601.yourvserver.net (Postfix, from userid 1000) id A47F4728002B; Sat, 1 Sep 2012 09:30:39 +0200 (CEST) From: Stefan Weil To: Paolo Bonzini Date: Sat, 1 Sep 2012 09:30:39 +0200 Message-Id: <1346484639-15141-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: Stefan Weil , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] qapi: 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: qapi-visit.c:1640 visit_type_BlockdevAction(8) error: we previously assumed 'obj' could be null (see line 1639) qapi-visit.c:2432 visit_type_NetClientOptions(8) error: we previously assumed 'obj' could be null (see line 2431) Signed-off-by: Stefan Weil Reviewed-by: Paolo Bonzini --- scripts/qapi-visit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 2afc5c0..1a669f3 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -157,7 +157,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** if (!error_is_set(errp)) { visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s), &err); if (!err) { - if (!obj || *obj) { + if (obj && *obj) { visit_type_%(name)sKind(m, &(*obj)->kind, "type", &err); if (!err) { switch ((*obj)->kind) {