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

diff --git a/07/15770ca994c0bfb27387dc366c9ac46d9cc5a0 b/07/15770ca994c0bfb27387dc366c9ac46d9cc5a0
new file mode 100644 (file)
index 0000000..75bc9cf
--- /dev/null
+++ b/07/15770ca994c0bfb27387dc366c9ac46d9cc5a0
@@ -0,0 +1,90 @@
+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 E5793431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Sep 2012 05:50:54 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 hEv-2e4jwaHR for <notmuch@notmuchmail.org>;\r
+       Fri, 21 Sep 2012 05:50:53 -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 22C80431FAF\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Sep 2012 05:50:53 -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 CEF6E5AB08B\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Sep 2012 14:50:49 +0200 (CEST)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id 3D29BDF2A5; Fri, 21 Sep 2012 14:50:49 +0200 (CEST)\r
+Received: from thinkbox.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228])\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 E3F94DF2A1;\r
+       Fri, 21 Sep 2012 14:50:47 +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 1TF2gv-0005fL-DI; Fri, 21 Sep 2012 14:50:45 +0200\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] Avoid potentially dereferencing a NULL pointer\r
+Date: Fri, 21 Sep 2012 14:50:37 +0200\r
+Message-Id:\r
+ <1348231837-21700-2-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To:\r
+ <1348231837-21700-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References:\r
+ <1348231837-21700-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: Fri, 21 Sep 2012 12:50:55 -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