[PATCH 5/5] Avoid potentially dereferencing a NULL pointer

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