76/6a33af8cce670b6e9222f947b932b7e318ea30

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id B8BA8431FAF\r
   6         for <notmuch@notmuchmail.org>; Sat, 17 Mar 2012 10:26:35 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id t2K5Ez6kXOPK for <notmuch@notmuchmail.org>;\r
  16         Sat, 17 Mar 2012 10:26:35 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
  18         [18.9.25.14])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 1E496431FAE\r
  20         for <notmuch@notmuchmail.org>; Sat, 17 Mar 2012 10:26:35 -0700 (PDT)\r
  21 X-AuditID: 1209190e-b7f7c6d0000008c3-e2-4f64c94a553a\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id E2.56.02243.A49C46F4; Sat, 17 Mar 2012 13:26:34 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q2HHQYPC016490; \r
  27         Sat, 17 Mar 2012 13:26:34 -0400\r
  28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q2HHQWa9017090\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Sat, 17 Mar 2012 13:26:33 -0400 (EDT)\r
  34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1S8xOi-0004FQ-FF; Sat, 17 Mar 2012 13:26:32 -0400\r
  37 Date: Sat, 17 Mar 2012 13:26:32 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: Justus Winter <4winter@informatik.uni-hamburg.de>\r
  40 Subject: Re: [PATCH] Fix error reporting in\r
  41         notmuch_database_find_message_by_filename\r
  42 Message-ID: <20120317172632.GM2670@mit.edu>\r
  43 References:\r
  44  <1332002487-32411-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
  45         <1332002487-32411-2-git-send-email-4winter@informatik.uni-hamburg.de>\r
  46 MIME-Version: 1.0\r
  47 Content-Type: text/plain; charset=us-ascii\r
  48 Content-Disposition: inline\r
  49 In-Reply-To:\r
  50  <1332002487-32411-2-git-send-email-4winter@informatik.uni-hamburg.de>\r
  51 User-Agent: Mutt/1.5.21 (2010-09-15)\r
  52 X-Brightmail-Tracker:\r
  53  H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hRV1vU6meJvMPOAjsXs1h9MFtdvzmR2\r
  54         YPKYeP40m8ezVbeYA5iiuGxSUnMyy1KL9O0SuDJ+fnjCWrCBs+LDqTmMDYyb2bsYOTkkBEwk\r
  55         /h6/xAhhi0lcuLeeDcQWEtjHKLFsW0oXIxeQvYFR4v66P+wQzkkmiQlTOhghnCWMEp0P57KC\r
  56         tLAIqEpceHyPGcRmE9CQ2LZ/OdhYEQFTiQ0PHoCtYxaQlvj2u5kJxBYWCJfomX4XaB0HB6+A\r
  57         tsS0N74QM2cySuy+fxSsnldAUOLkzCcsEL1aEjf+vWQCqQeZs/wfB0iYUyBIouXcZ7C1ogIq\r
  58         ElNObmObwCg0C0n3LCTdsxC6FzAyr2KUTcmt0s1NzMwpTk3WLU5OzMtLLdI11svNLNFLTSnd\r
  59         xAgOa0m+HYxfDyodYhTgYFTi4eWYkOwvxJpYVlyZe4hRkoNJSZSX8UCKvxBfUn5KZUZicUZ8\r
  60         UWlOavEhRgkOZiURXqnlQDnelMTKqtSifJiUNAeLkjivmtY7PyGB9MSS1OzU1ILUIpisDAeH\r
  61         kgTvoRNAjYJFqempFWmZOSUIaSYOTpDhPEDDt4PU8BYXJOYWZ6ZD5E8xKkqJ824ASQiAJDJK\r
  62         8+B6YWnnFaM40CvCvNdBqniAKQuu+xXQYCagwTPLkkEGlyQipKQaGA0N+l8LGz94dvPMzo1x\r
  63         nNPT1jleu2H4dM6y6VUxRfFhc33mfJN91rSMeZp6r+C281uesh7feqfF3E/kVZHe/aX/LWMF\r
  64         lnuzMk1fkHbD9OWlnqkKfEoOdu/uqj/r4X9/clnslbPrjpRc3M1xkbn95r6nqp8+sBom7JxW\r
  65         bK9x+MO/rP0zLFx4rsgosRRnJBpqMRcVJwIAG6DQYBYDAAA=\r
  66 Cc: notmuch@notmuchmail.org\r
  67 X-BeenThere: notmuch@notmuchmail.org\r
  68 X-Mailman-Version: 2.1.13\r
  69 Precedence: list\r
  70 List-Id: "Use and development of the notmuch mail system."\r
  71         <notmuch.notmuchmail.org>\r
  72 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  73         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  74 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  75 List-Post: <mailto:notmuch@notmuchmail.org>\r
  76 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  77 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  78         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  79 X-List-Received-Date: Sat, 17 Mar 2012 17:26:35 -0000\r
  80 \r
  81 Quoth Justus Winter on Mar 17 at  5:41 pm:\r
  82 > Formerly it was possible for *message_ret to be left\r
  83 > uninitialized. The documentation however clearly states that "[o]n any\r
  84 > failure or when the message is not found, this function initializes\r
  85 > '*message' to NULL".\r
  86 > \r
  87 > Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
  88 > ---\r
  89 \r
  90 Good catch.  Actually, it looks like the error handling path in this\r
  91 function was completely bogus without this, since it checks if\r
  92 *message_ret is non-NULL and destroys it if so, even though the\r
  93 function may not have been the one to set it to NULL (and it may have\r
  94 been uninitialized in the caller).\r
  95 \r
  96 So, LGTM.\r
  97 \r
  98 >  lib/database.cc |    3 +++\r
  99 >  1 files changed, 3 insertions(+), 0 deletions(-)\r
 100 > \r
 101 > diff --git a/lib/database.cc b/lib/database.cc\r
 102 > index 8f8df1a..16c4354 100644\r
 103 > --- a/lib/database.cc\r
 104 > +++ b/lib/database.cc\r
 105 > @@ -1825,6 +1825,9 @@ notmuch_database_find_message_by_filename (notmuch_database_t *notmuch,\r
 106 >      if (message_ret == NULL)\r
 107 >       return NOTMUCH_STATUS_NULL_POINTER;\r
 108 >  \r
 109 > +    /* return NULL on any failure */\r
 110 > +    *message_ret = NULL;\r
 111 > +\r
 112 >      local = talloc_new (notmuch);\r
 113 >  \r
 114 >      try {\r