From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Mon, 24 Sep 2012 15:21:20 +0000 (+0200) Subject: [PATCH 6/6] Avoid potentially dereferencing a NULL pointer X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c3ab5d5fecf0bcde4e2f3d7201c6fa3a702a31df;p=notmuch-archives.git [PATCH 6/6] Avoid potentially dereferencing a NULL pointer --- diff --git a/bc/44c01a585e18630814084c0b9f616cb6ace995 b/bc/44c01a585e18630814084c0b9f616cb6ace995 new file mode 100644 index 000000000..b04b6b1d8 --- /dev/null +++ b/bc/44c01a585e18630814084c0b9f616cb6ace995 @@ -0,0 +1,90 @@ +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 EAAF6429E26 + for ; Mon, 24 Sep 2012 08:21:47 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 5fls1yN9yLft for ; + Mon, 24 Sep 2012 08:21:47 -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 6CF40431FC7 + for ; Mon, 24 Sep 2012 08:21:44 -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 4BCD05AB296 + for ; Mon, 24 Sep 2012 17:21:43 +0200 (CEST) +Received: by mail.jade-hamburg.de (Postfix, from userid 401) + id BDCEEDF2A2; Mon, 24 Sep 2012 17:21:42 +0200 (CEST) +Received: from thinkbox.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228]) + (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 202F5DF2A6; + Mon, 24 Sep 2012 17:21:32 +0200 (CEST) +Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.80) + (envelope-from ) + id 1TGATR-0007lN-2R; Mon, 24 Sep 2012 17:21:29 +0200 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +To: notmuch@notmuchmail.org +Subject: [PATCH 6/6] Avoid potentially dereferencing a NULL pointer +Date: Mon, 24 Sep 2012 17:21:20 +0200 +Message-Id: + <1348500080-29726-6-git-send-email-4winter@informatik.uni-hamburg.de> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: + <1348500080-29726-1-git-send-email-4winter@informatik.uni-hamburg.de> +References: <873927eb5i.fsf@convex-new.cs.unb.ca> + <1348500080-29726-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 15:21:48 -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 +