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 788AC431FB6
\r
6 for <notmuch@notmuchmail.org>; Sat, 18 Feb 2012 16:58:14 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\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 p1cGWzLQ8UTD for <notmuch@notmuchmail.org>;
\r
16 Sat, 18 Feb 2012 16:58:13 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id CB97C431FAE
\r
20 for <notmuch@notmuchmail.org>; Sat, 18 Feb 2012 16:58:13 -0800 (PST)
\r
21 X-AuditID: 12074424-b7fae6d000000906-b5-4f404925dce4
\r
22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])
\r
23 by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id E8.87.02310.529404F4; Sat, 18 Feb 2012 19:58:13 -0500 (EST)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q1J0wCtd006045;
\r
27 Sat, 18 Feb 2012 19:58:12 -0500
\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 q1J0wB3w013871
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Sat, 18 Feb 2012 19:58:12 -0500 (EST)
\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 1Ryv4g-0005sG-W3; Sat, 18 Feb 2012 19:56:23 -0500
\r
37 Date: Sat, 18 Feb 2012 19:56:22 -0500
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: Justus Winter <4winter@informatik.uni-hamburg.de>
\r
40 Subject: Re: [PATCH] Prevent segmentation fault in notmuch_database_close
\r
41 Message-ID: <20120219005622.GO5991@mit.edu>
\r
43 <1329609417-8391-1-git-send-email-4winter@informatik.uni-hamburg.de>
\r
44 <1329609417-8391-2-git-send-email-4winter@informatik.uni-hamburg.de>
\r
46 Content-Type: text/plain; charset=us-ascii
\r
47 Content-Disposition: inline
\r
49 <1329609417-8391-2-git-send-email-4winter@informatik.uni-hamburg.de>
\r
50 User-Agent: Mutt/1.5.21 (2010-09-15)
\r
51 X-Brightmail-Tracker:
\r
52 H4sIAAAAAAAAA+NgFmplleLIzCtJLcpLzFFi42IRYrdT0VX1dPA3OPpQymJ26w8mi+s3ZzI7
\r
53 MHlMPH+azePZqlvMAUxRXDYpqTmZZalF+nYJXBmfLlxgLNjHWbH44wm2Bsab7F2MnBwSAiYS
\r
54 T3a3sUHYYhIX7q0Hsrk4hAT2MUqcv76YBcLZwCjx/8A/VgjnJJPErstXoDJLGCW+HFvPCNLP
\r
55 IqAq8WneObC5bAIaEtv2LweLiwiYSmx48AAsziwgLfHtdzMTiC0s4Cmx4tAjFhCbV0BbYvKc
\r
56 n0wQQ6czSvzauAUqIShxcuYTFohmLYkb/14CFXGADVr+jwMkzCkQKNH47T3YLlEBFYkpJ7ex
\r
57 TWAUmoWkexaS7lkI3QsYmVcxyqbkVunmJmbmFKcm6xYnJ+blpRbpmuvlZpbopaaUbmIEh7aL
\r
58 yg7G5kNKhxgFOBiVeHhfddr5C7EmlhVX5h5ilORgUhLldXJ18BfiS8pPqcxILM6ILyrNSS0+
\r
59 xCjBwawkwlt6095fiDclsbIqtSgfJiXNwaIkzquh9c5PSCA9sSQ1OzW1ILUIJivDwaEkwRvq
\r
60 ATRUsCg1PbUiLTOnBCHNxMEJMpwHaHgESA1vcUFibnFmOkT+FKOilDhvCUhCACSRUZoH1wtL
\r
61 Pa8YxYFeEeYtAqniAaYtuO5XQIOZgAbzCtmBDC5JREhJNTDKxTmWzc1tmMu86tEehT+nswrv
\r
62 T/AotNB7OesLr0H+g+/zVQ+aHl+6Y8OD488krJ7J9dwOVxR9zCcS/ufFtHQht1Pf9zCGb5QM
\r
63 uWFj8rdWesKD1MafT2Ij36zd5srF/vG+rCTn9RPqP5LOBIsIO/1cuy7lXe1qgdq15levnvcO
\r
64 bnF+PHGGuUKrEktxRqKhFnNRcSIAc3wwQRgDAAA=
\r
65 Cc: notmuch@notmuchmail.org
\r
66 X-BeenThere: notmuch@notmuchmail.org
\r
67 X-Mailman-Version: 2.1.13
\r
69 List-Id: "Use and development of the notmuch mail system."
\r
70 <notmuch.notmuchmail.org>
\r
71 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
72 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
73 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
74 List-Post: <mailto:notmuch@notmuchmail.org>
\r
75 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
76 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
77 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
78 X-List-Received-Date: Sun, 19 Feb 2012 00:58:14 -0000
\r
80 Quoth Justus Winter on Feb 19 at 12:56 am:
\r
81 > Previously opening a notmuch database in read write mode that has been
\r
82 > locked resulted in the notmuch_database_open function executing
\r
83 > notmuch_database_close as a cleanup function. notmuch_database_close
\r
84 > failed to check whether the xapian database has in fact been created.
\r
86 > Add a check whether the xapian database object has actually been
\r
87 > created before trying to call its flush method.
\r
89 > Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
\r
94 > lib/database.cc | 3 ++-
\r
95 > 1 files changed, 2 insertions(+), 1 deletions(-)
\r
97 > diff --git a/lib/database.cc b/lib/database.cc
\r
98 > index c928d02..5efa85e 100644
\r
99 > --- a/lib/database.cc
\r
100 > +++ b/lib/database.cc
\r
101 > @@ -716,7 +716,8 @@ void
\r
102 > notmuch_database_close (notmuch_database_t *notmuch)
\r
105 > - if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE)
\r
106 > + if (notmuch->xapian_db != NULL &&
\r
107 > + notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE)
\r
108 > (static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db))->flush ();
\r
109 > } catch (const Xapian::Error &error) {
\r
110 > if (! notmuch->exception_reported) {
\r