[PATCH] Fix error reporting in notmuch_database_find_message_by_filename

diff --git a/88/a003deded234a52e130525b555d037618be1b5 b/88/a003deded234a52e130525b555d037618be1b5
new file mode 100644 (file)
index 0000000..48ae846
--- /dev/null
+++ b/88/a003deded234a52e130525b555d037618be1b5
@@ -0,0 +1,89 @@
+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 897A1431FDA\r
+       for <notmuch@notmuchmail.org>; Sat, 17 Mar 2012 09:42:52 -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 Tx5zwxqTc-n2 for <notmuch@notmuchmail.org>;\r
+       Sat, 17 Mar 2012 09:42:50 -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 DECAA431FC4\r
+       for <notmuch@notmuchmail.org>; Sat, 17 Mar 2012 09:42:47 -0700 (PDT)\r
+Received: from mail.jade-hamburg.de (unknown [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 46290329F52\r
+       for <notmuch@notmuchmail.org>; Sat, 17 Mar 2012 17:42:46 +0100 (CET)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id BD178DF2A2; Sat, 17 Mar 2012 17:42:45 +0100 (CET)\r
+Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested) (Authenticated sender: teythoon)\r
+       by mail.jade-hamburg.de (Postfix) with ESMTPSA id B733EDF2A1;\r
+       Sat, 17 Mar 2012 17:42:40 +0100 (CET)\r
+Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)\r
+       (envelope-from <teythoon@thinkbox.jade-hamburg.de>)\r
+       id 1S8whF-0008Ru-2b; Sat, 17 Mar 2012 17:41:37 +0100\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Fix error reporting in\r
+       notmuch_database_find_message_by_filename\r
+Date: Sat, 17 Mar 2012 17:41:27 +0100\r
+Message-Id:\r
+ <1332002487-32411-2-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To:\r
+ <1332002487-32411-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References:\r
+ <1332002487-32411-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: Sat, 17 Mar 2012 16:42:53 -0000\r
+\r
+Formerly it was possible for *message_ret to be left\r
+uninitialized. The documentation however clearly states that "[o]n any\r
+failure or when the message is not found, this function initializes\r
+'*message' to NULL".\r
+\r
+Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+---\r
+ lib/database.cc |    3 +++\r
+ 1 files changed, 3 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 8f8df1a..16c4354 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -1825,6 +1825,9 @@ notmuch_database_find_message_by_filename (notmuch_database_t *notmuch,\r
+     if (message_ret == NULL)\r
+       return NOTMUCH_STATUS_NULL_POINTER;\r
+ \r
++    /* return NULL on any failure */\r
++    *message_ret = NULL;\r
++\r
+     local = talloc_new (notmuch);\r
+ \r
+     try {\r
+-- \r
+1.7.9.1\r
+\r