Re: [PATCH] Fix error reporting in notmuch_database_find_message_by_filename

diff --git a/76/6a33af8cce670b6e9222f947b932b7e318ea30 b/76/6a33af8cce670b6e9222f947b932b7e318ea30
new file mode 100644 (file)
index 0000000..f8f9c9d
--- /dev/null
+++ b/76/6a33af8cce670b6e9222f947b932b7e318ea30
@@ -0,0 +1,114 @@
+Return-Path: <amdragon@mit.edu>\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 B8BA8431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 17 Mar 2012 10:26:35 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 t2K5Ez6kXOPK for <notmuch@notmuchmail.org>;\r
+       Sat, 17 Mar 2012 10:26:35 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+       [18.9.25.14])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1E496431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 17 Mar 2012 10:26:35 -0700 (PDT)\r
+X-AuditID: 1209190e-b7f7c6d0000008c3-e2-4f64c94a553a\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id E2.56.02243.A49C46F4; Sat, 17 Mar 2012 13:26:34 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q2HHQYPC016490; \r
+       Sat, 17 Mar 2012 13:26:34 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q2HHQWa9017090\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 17 Mar 2012 13:26:33 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1S8xOi-0004FQ-FF; Sat, 17 Mar 2012 13:26:32 -0400\r
+Date: Sat, 17 Mar 2012 13:26:32 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+Subject: Re: [PATCH] Fix error reporting in\r
+       notmuch_database_find_message_by_filename\r
+Message-ID: <20120317172632.GM2670@mit.edu>\r
+References:\r
+ <1332002487-32411-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+       <1332002487-32411-2-git-send-email-4winter@informatik.uni-hamburg.de>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To:\r
+ <1332002487-32411-2-git-send-email-4winter@informatik.uni-hamburg.de>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hRV1vU6meJvMPOAjsXs1h9MFtdvzmR2\r
+       YPKYeP40m8ezVbeYA5iiuGxSUnMyy1KL9O0SuDJ+fnjCWrCBs+LDqTmMDYyb2bsYOTkkBEwk\r
+       /h6/xAhhi0lcuLeeDcQWEtjHKLFsW0oXIxeQvYFR4v66P+wQzkkmiQlTOhghnCWMEp0P57KC\r
+       tLAIqEpceHyPGcRmE9CQ2LZ/OdhYEQFTiQ0PHoCtYxaQlvj2u5kJxBYWCJfomX4XaB0HB6+A\r
+       tsS0N74QM2cySuy+fxSsnldAUOLkzCcsEL1aEjf+vWQCqQeZs/wfB0iYUyBIouXcZ7C1ogIq\r
+       ElNObmObwCg0C0n3LCTdsxC6FzAyr2KUTcmt0s1NzMwpTk3WLU5OzMtLLdI11svNLNFLTSnd\r
+       xAgOa0m+HYxfDyodYhTgYFTi4eWYkOwvxJpYVlyZe4hRkoNJSZSX8UCKvxBfUn5KZUZicUZ8\r
+       UWlOavEhRgkOZiURXqnlQDnelMTKqtSifJiUNAeLkjivmtY7PyGB9MSS1OzU1ILUIpisDAeH\r
+       kgTvoRNAjYJFqempFWmZOSUIaSYOTpDhPEDDt4PU8BYXJOYWZ6ZD5E8xKkqJ824ASQiAJDJK\r
+       8+B6YWnnFaM40CvCvNdBqniAKQuu+xXQYCagwTPLkkEGlyQipKQaGA0N+l8LGz94dvPMzo1x\r
+       nNPT1jleu2H4dM6y6VUxRfFhc33mfJN91rSMeZp6r+C281uesh7feqfF3E/kVZHe/aX/LWMF\r
+       lnuzMk1fkHbD9OWlnqkKfEoOdu/uqj/r4X9/clnslbPrjpRc3M1xkbn95r6nqp8+sBom7JxW\r
+       bK9x+MO/rP0zLFx4rsgosRRnJBpqMRcVJwIAG6DQYBYDAAA=\r
+Cc: notmuch@notmuchmail.org\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 17:26:35 -0000\r
+\r
+Quoth Justus Winter on Mar 17 at  5:41 pm:\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
+\r
+Good catch.  Actually, it looks like the error handling path in this\r
+function was completely bogus without this, since it checks if\r
+*message_ret is non-NULL and destroys it if so, even though the\r
+function may not have been the one to set it to NULL (and it may have\r
+been uninitialized in the caller).\r
+\r
+So, LGTM.\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