Re: [PATCH] Prevent segmentation fault in notmuch_database_close

diff --git a/11/96e39f89a0f01230003a3c537764d513eb1a89 b/11/96e39f89a0f01230003a3c537764d513eb1a89
new file mode 100644 (file)
index 0000000..1f95378
--- /dev/null
+++ b/11/96e39f89a0f01230003a3c537764d513eb1a89
@@ -0,0 +1,110 @@
+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 788AC431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Feb 2012 16:58:14 -0800 (PST)\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 p1cGWzLQ8UTD for <notmuch@notmuchmail.org>;\r
+       Sat, 18 Feb 2012 16:58:13 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id CB97C431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Feb 2012 16:58:13 -0800 (PST)\r
+X-AuditID: 12074424-b7fae6d000000906-b5-4f404925dce4\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id E8.87.02310.529404F4; Sat, 18 Feb 2012 19:58:13 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q1J0wCtd006045; \r
+       Sat, 18 Feb 2012 19:58:12 -0500\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 q1J0wB3w013871\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 18 Feb 2012 19:58:12 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1Ryv4g-0005sG-W3; Sat, 18 Feb 2012 19:56:23 -0500\r
+Date: Sat, 18 Feb 2012 19:56:22 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+Subject: Re: [PATCH] Prevent segmentation fault in notmuch_database_close\r
+Message-ID: <20120219005622.GO5991@mit.edu>\r
+References:\r
+ <1329609417-8391-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+       <1329609417-8391-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
+ <1329609417-8391-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+NgFmplleLIzCtJLcpLzFFi42IRYrdT0VX1dPA3OPpQymJ26w8mi+s3ZzI7\r
+       MHlMPH+azePZqlvMAUxRXDYpqTmZZalF+nYJXBmfLlxgLNjHWbH44wm2Bsab7F2MnBwSAiYS\r
+       T3a3sUHYYhIX7q0Hsrk4hAT2MUqcv76YBcLZwCjx/8A/VgjnJJPErstXoDJLGCW+HFvPCNLP\r
+       IqAq8WneObC5bAIaEtv2LweLiwiYSmx48AAsziwgLfHtdzMTiC0s4Cmx4tAjFhCbV0BbYvKc\r
+       n0wQQ6czSvzauAUqIShxcuYTFohmLYkb/14CFXGADVr+jwMkzCkQKNH47T3YLlEBFYkpJ7ex\r
+       TWAUmoWkexaS7lkI3QsYmVcxyqbkVunmJmbmFKcm6xYnJ+blpRbpmuvlZpbopaaUbmIEh7aL\r
+       yg7G5kNKhxgFOBiVeHhfddr5C7EmlhVX5h5ilORgUhLldXJ18BfiS8pPqcxILM6ILyrNSS0+\r
+       xCjBwawkwlt6095fiDclsbIqtSgfJiXNwaIkzquh9c5PSCA9sSQ1OzW1ILUIJivDwaEkwRvq\r
+       ATRUsCg1PbUiLTOnBCHNxMEJMpwHaHgESA1vcUFibnFmOkT+FKOilDhvCUhCACSRUZoH1wtL\r
+       Pa8YxYFeEeYtAqniAaYtuO5XQIOZgAbzCtmBDC5JREhJNTDKxTmWzc1tmMu86tEehT+nswrv\r
+       T/AotNB7OesLr0H+g+/zVQ+aHl+6Y8OD488krJ7J9dwOVxR9zCcS/ufFtHQht1Pf9zCGb5QM\r
+       uWFj8rdWesKD1MafT2Ij36zd5srF/vG+rCTn9RPqP5LOBIsIO/1cuy7lXe1qgdq15levnvcO\r
+       bnF+PHGGuUKrEktxRqKhFnNRcSIAc3wwQRgDAAA=\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: Sun, 19 Feb 2012 00:58:14 -0000\r
+\r
+Quoth Justus Winter on Feb 19 at 12:56 am:\r
+> Previously opening a notmuch database in read write mode that has been\r
+> locked resulted in the notmuch_database_open function executing\r
+> notmuch_database_close as a cleanup function. notmuch_database_close\r
+> failed to check whether the xapian database has in fact been created.\r
+> \r
+> Add a check whether the xapian database object has actually been\r
+> created before trying to call its flush method.\r
+> \r
+> Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+\r
+LGTM.  Nice catch.\r
+\r
+> ---\r
+>  lib/database.cc |    3 ++-\r
+>  1 files changed, 2 insertions(+), 1 deletions(-)\r
+> \r
+> diff --git a/lib/database.cc b/lib/database.cc\r
+> index c928d02..5efa85e 100644\r
+> --- a/lib/database.cc\r
+> +++ b/lib/database.cc\r
+> @@ -716,7 +716,8 @@ void\r
+>  notmuch_database_close (notmuch_database_t *notmuch)\r
+>  {\r
+>      try {\r
+> -    if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE)\r
+> +    if (notmuch->xapian_db != NULL &&\r
+> +        notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE)\r
+>          (static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->flush ();\r
+>      } catch (const Xapian::Error &error) {\r
+>      if (! notmuch->exception_reported) {\r