1 Return-Path: <teythoon@jade-hamburg.de>
\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 2E974431FC4
\r
6 for <notmuch@notmuchmail.org>; Sat, 18 Feb 2012 15:57:22 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 Is-M3hrhtsUf for <notmuch@notmuchmail.org>;
\r
16 Sat, 18 Feb 2012 15:57:20 -0800 (PST)
\r
17 Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])
\r
18 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 3A80B431FD2
\r
21 for <notmuch@notmuchmail.org>; Sat, 18 Feb 2012 15:57:18 -0800 (PST)
\r
22 Received: from mail.jade-hamburg.de (unknown [85.183.11.228])
\r
23 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
\r
24 (No client certificate requested)
\r
25 by mail.cryptobitch.de (Postfix) with ESMTPSA id 7E93A52EF7F
\r
26 for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 00:57:16 +0100 (CET)
\r
27 Received: by mail.jade-hamburg.de (Postfix, from userid 401)
\r
28 id F238FDF2A2; Sun, 19 Feb 2012 00:57:15 +0100 (CET)
\r
29 Received: from thinkbox.jade-hamburg.de
\r
30 (dslb-092-078-042-203.pools.arcor-ip.net [92.78.42.203])
\r
31 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
32 (No client certificate requested) (Authenticated sender: teythoon)
\r
33 by mail.jade-hamburg.de (Postfix) with ESMTPSA id 5D0CEDF2A1;
\r
34 Sun, 19 Feb 2012 00:57:07 +0100 (CET)
\r
35 Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)
\r
36 (envelope-from <teythoon@thinkbox.jade-hamburg.de>)
\r
37 id 1Ryu9K-0002GR-D4; Sun, 19 Feb 2012 00:57:06 +0100
\r
38 From: Justus Winter <4winter@informatik.uni-hamburg.de>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH] Prevent segmentation fault in notmuch_database_close
\r
41 Date: Sun, 19 Feb 2012 00:56:57 +0100
\r
43 <1329609417-8391-2-git-send-email-4winter@informatik.uni-hamburg.de>
\r
44 X-Mailer: git-send-email 1.7.9
\r
46 <1329609417-8391-1-git-send-email-4winter@informatik.uni-hamburg.de>
\r
48 <1329609417-8391-1-git-send-email-4winter@informatik.uni-hamburg.de>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Sat, 18 Feb 2012 23:57:22 -0000
\r
63 Previously opening a notmuch database in read write mode that has been
\r
64 locked resulted in the notmuch_database_open function executing
\r
65 notmuch_database_close as a cleanup function. notmuch_database_close
\r
66 failed to check whether the xapian database has in fact been created.
\r
68 Add a check whether the xapian database object has actually been
\r
69 created before trying to call its flush method.
\r
71 Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
\r
73 lib/database.cc | 3 ++-
\r
74 1 files changed, 2 insertions(+), 1 deletions(-)
\r
76 diff --git a/lib/database.cc b/lib/database.cc
\r
77 index c928d02..5efa85e 100644
\r
78 --- a/lib/database.cc
\r
79 +++ b/lib/database.cc
\r
80 @@ -716,7 +716,8 @@ void
\r
81 notmuch_database_close (notmuch_database_t *notmuch)
\r
84 - if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE)
\r
85 + if (notmuch->xapian_db != NULL &&
\r
86 + notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE)
\r
87 (static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->flush ();
\r
88 } catch (const Xapian::Error &error) {
\r
89 if (! notmuch->exception_reported) {
\r