From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Mon, 24 Sep 2012 10:31:57 +0000 (+0200) Subject: [PATCH 5/5] Avoid potentially dereferencing a NULL pointer X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e5ef94173fe15ecd959105c0ea3e7bbff2de54f5;p=notmuch-archives.git [PATCH 5/5] Avoid potentially dereferencing a NULL pointer --- diff --git a/9a/f0a1184048be43388c3b66bba6845402842613 b/9a/f0a1184048be43388c3b66bba6845402842613 new file mode 100644 index 000000000..e0cf531d0 --- /dev/null +++ b/9a/f0a1184048be43388c3b66bba6845402842613 @@ -0,0 +1,91 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 4984C431FAF + for ; Mon, 24 Sep 2012 03:32:27 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.001 +X-Spam-Level: +X-Spam-Status: No, score=0.001 tagged_above=-999 required=5 + tests=[UNPARSEABLE_RELAY=0.001] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id PgEv+DP61ste for ; + Mon, 24 Sep 2012 03:32:26 -0700 (PDT) +Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id AB500431FC9 + for ; Mon, 24 Sep 2012 03:32:20 -0700 (PDT) +Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mail.cryptobitch.de (Postfix) with ESMTPSA id 7794E5AA9C9 + for ; Mon, 24 Sep 2012 12:32:19 +0200 (CEST) +Received: by mail.jade-hamburg.de (Postfix, from userid 401) + id DA1CFDF2A7; Mon, 24 Sep 2012 12:32:18 +0200 (CEST) +Received: from thinkbox.jade-hamburg.de (unknown + [IPv6:fe80::216:d3ff:fe3e:5058%br0]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) (Authenticated sender: teythoon) + by mail.jade-hamburg.de (Postfix) with ESMTPSA id 367BDDF2A4; + Mon, 24 Sep 2012 12:32:12 +0200 (CEST) +Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.80) + (envelope-from ) + id 1TG5xR-0002iH-UN; Mon, 24 Sep 2012 12:32:09 +0200 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +To: notmuch@notmuchmail.org +Subject: [PATCH 5/5] Avoid potentially dereferencing a NULL pointer +Date: Mon, 24 Sep 2012 12:31:57 +0200 +Message-Id: + <1348482717-10340-6-git-send-email-4winter@informatik.uni-hamburg.de> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: + <1348482717-10340-1-git-send-email-4winter@informatik.uni-hamburg.de> +References: <20120922161256.GE26662@mit.edu> + <1348482717-10340-1-git-send-email-4winter@informatik.uni-hamburg.de> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 24 Sep 2012 10:32:28 -0000 + +GMIME_IS_MULTIPART and GMIME_IS_MESSAGE both handle NULL pointers +gracefully, but the G_OBJECT_TYPE used in the error handling block +dereferences it without checking it first. + +Fix this by checking whether parent->part is valid. + +Found using the clang static analyzer. + +Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de> +--- + mime-node.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mime-node.c b/mime-node.c +index 97e8b48..839737a 100644 +--- a/mime-node.c ++++ b/mime-node.c +@@ -291,7 +291,7 @@ mime_node_child (mime_node_t *parent, int child) + GMimeObject *sub; + mime_node_t *node; + +- if (!parent || child < 0 || child >= parent->nchildren) ++ if (!parent || !parent->part || child < 0 || child >= parent->nchildren) + return NULL; + + if (GMIME_IS_MULTIPART (parent->part)) { +-- +1.7.10.4 +