[PATCH] Prevent segmentation fault in notmuch_database_close

diff --git a/97/e5eca3b6bf77b7969d3e5613d740d127dc5276 b/97/e5eca3b6bf77b7969d3e5613d740d127dc5276
new file mode 100644 (file)
index 0000000..183b51f
--- /dev/null
+++ b/97/e5eca3b6bf77b7969d3e5613d740d127dc5276
@@ -0,0 +1,92 @@
+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 2E974431FC4\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Feb 2012 15:57:22 -0800 (PST)\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 Is-M3hrhtsUf for <notmuch@notmuchmail.org>;\r
+       Sat, 18 Feb 2012 15:57:20 -0800 (PST)\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 3A80B431FD2\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Feb 2012 15:57:18 -0800 (PST)\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 7E93A52EF7F\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 00:57:16 +0100 (CET)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id F238FDF2A2; Sun, 19 Feb 2012 00:57:15 +0100 (CET)\r
+Received: from thinkbox.jade-hamburg.de\r
+       (dslb-092-078-042-203.pools.arcor-ip.net [92.78.42.203])\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 5D0CEDF2A1;\r
+       Sun, 19 Feb 2012 00:57:07 +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 1Ryu9K-0002GR-D4; Sun, 19 Feb 2012 00:57:06 +0100\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Prevent segmentation fault in notmuch_database_close\r
+Date: Sun, 19 Feb 2012 00:56:57 +0100\r
+Message-Id:\r
+ <1329609417-8391-2-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.9\r
+In-Reply-To:\r
+ <1329609417-8391-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References:\r
+ <1329609417-8391-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, 18 Feb 2012 23:57:22 -0000\r
+\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
+ 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
+-- \r
+1.7.9\r
+\r