Prevent segmentation fault in notmuch_database_close

diff --git a/d7/5402c749d8db688f7f52068c52a606348de68d b/d7/5402c749d8db688f7f52068c52a606348de68d
new file mode 100644 (file)
index 0000000..b3c7903
--- /dev/null
+++ b/d7/5402c749d8db688f7f52068c52a606348de68d
@@ -0,0 +1,95 @@
+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 DCD1D431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Feb 2012 15:57:15 -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 h1HJLJTDZv+r for <notmuch@notmuchmail.org>;\r
+       Sat, 18 Feb 2012 15:57:15 -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 D46A2431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Feb 2012 15:57:14 -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 D4C6652EF7F\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 00:57:12 +0100 (CET)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id 0D917DF2A4; Sun, 19 Feb 2012 00:57:12 +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 B0606DF2A0\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 00:57:06 +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 1Ryu9I-0002GO-St\r
+       for notmuch@notmuchmail.org; Sun, 19 Feb 2012 00:57:04 +0100\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: Prevent segmentation fault in notmuch_database_close\r
+Date: Sun, 19 Feb 2012 00:56:56 +0100\r
+Message-Id:\r
+ <1329609417-8391-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.9\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:16 -0000\r
+\r
+I've seen some segmentation faults lately again and rechecked the\r
+python bindings and while I actually found and fixed some error\r
+handling issues I overlooked last time, I think I also found a bug in\r
+notmuch_database_close.\r
+\r
+The problem can easily be reproduced with the following program:\r
+\r
+~~~ snip ~~~\r
+import os\r
+import time\r
+import notmuch\r
+\r
+db_path = os.path.expanduser('~/Maildir')\r
+\r
+os.fork()\r
+with notmuch.Database(db_path, mode=notmuch.Database.MODE.READ_WRITE) as db:\r
+    time.sleep(5)\r
+~~~ snap ~~~\r
+\r
+The top of the resulting stack trace is\r
+\r
+~~~ snip ~~~\r
+#0  0x00007fa2b6ac8104 in Xapian::WritableDatabase::commit() ()\r
+   from /usr/lib/libxapian.so.22\r
+#1  0x00007fa2b7839de8 in Xapian::WritableDatabase::flush (this=0x0)\r
+    at /usr/include/xapian/database.h:579\r
+#2  0x00007fa2b78367aa in notmuch_database_close (notmuch=0x121ea70)\r
+    at lib/database.cc:722\r
+#3  0x00007fa2b7836749 in notmuch_database_open (path=\r
+    0x7fa2b948ac94 "/home/teythoon/Maildir",\r
+    mode=NOTMUCH_DATABASE_MODE_READ_WRITE) at lib/database.cc:705\r
+~~~ snap ~~~\r
+\r
+Cheers,\r
+Justus\r
+\r