From: Austin Clements Date: Sun, 19 Feb 2012 00:56:22 +0000 (+1900) Subject: Re: [PATCH] Prevent segmentation fault in notmuch_database_close X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=399a0eb6978202f88d7f35cab17bb385a8ca5ac1;p=notmuch-archives.git Re: [PATCH] Prevent segmentation fault in notmuch_database_close --- diff --git a/11/96e39f89a0f01230003a3c537764d513eb1a89 b/11/96e39f89a0f01230003a3c537764d513eb1a89 new file mode 100644 index 000000000..1f95378ad --- /dev/null +++ b/11/96e39f89a0f01230003a3c537764d513eb1a89 @@ -0,0 +1,110 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 788AC431FB6 + for ; Sat, 18 Feb 2012 16:58:14 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id p1cGWzLQ8UTD for ; + Sat, 18 Feb 2012 16:58:13 -0800 (PST) +Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU + [18.7.68.36]) + by olra.theworths.org (Postfix) with ESMTP id CB97C431FAE + for ; Sat, 18 Feb 2012 16:58:13 -0800 (PST) +X-AuditID: 12074424-b7fae6d000000906-b5-4f404925dce4 +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP + id E8.87.02310.529404F4; Sat, 18 Feb 2012 19:58:13 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q1J0wCtd006045; + Sat, 18 Feb 2012 19:58:12 -0500 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1J0wB3w013871 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sat, 18 Feb 2012 19:58:12 -0500 (EST) +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1Ryv4g-0005sG-W3; Sat, 18 Feb 2012 19:56:23 -0500 +Date: Sat, 18 Feb 2012 19:56:22 -0500 +From: Austin Clements +To: Justus Winter <4winter@informatik.uni-hamburg.de> +Subject: Re: [PATCH] Prevent segmentation fault in notmuch_database_close +Message-ID: <20120219005622.GO5991@mit.edu> +References: + <1329609417-8391-1-git-send-email-4winter@informatik.uni-hamburg.de> + <1329609417-8391-2-git-send-email-4winter@informatik.uni-hamburg.de> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +In-Reply-To: + <1329609417-8391-2-git-send-email-4winter@informatik.uni-hamburg.de> +User-Agent: Mutt/1.5.21 (2010-09-15) +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFmplleLIzCtJLcpLzFFi42IRYrdT0VX1dPA3OPpQymJ26w8mi+s3ZzI7 + MHlMPH+azePZqlvMAUxRXDYpqTmZZalF+nYJXBmfLlxgLNjHWbH44wm2Bsab7F2MnBwSAiYS + T3a3sUHYYhIX7q0Hsrk4hAT2MUqcv76YBcLZwCjx/8A/VgjnJJPErstXoDJLGCW+HFvPCNLP + IqAq8WneObC5bAIaEtv2LweLiwiYSmx48AAsziwgLfHtdzMTiC0s4Cmx4tAjFhCbV0BbYvKc + n0wQQ6czSvzauAUqIShxcuYTFohmLYkb/14CFXGADVr+jwMkzCkQKNH47T3YLlEBFYkpJ7ex + TWAUmoWkexaS7lkI3QsYmVcxyqbkVunmJmbmFKcm6xYnJ+blpRbpmuvlZpbopaaUbmIEh7aL + yg7G5kNKhxgFOBiVeHhfddr5C7EmlhVX5h5ilORgUhLldXJ18BfiS8pPqcxILM6ILyrNSS0+ + xCjBwawkwlt6095fiDclsbIqtSgfJiXNwaIkzquh9c5PSCA9sSQ1OzW1ILUIJivDwaEkwRvq + ATRUsCg1PbUiLTOnBCHNxMEJMpwHaHgESA1vcUFibnFmOkT+FKOilDhvCUhCACSRUZoH1wtL + Pa8YxYFeEeYtAqniAaYtuO5XQIOZgAbzCtmBDC5JREhJNTDKxTmWzc1tmMu86tEehT+nswrv + T/AotNB7OesLr0H+g+/zVQ+aHl+6Y8OD488krJ7J9dwOVxR9zCcS/ufFtHQht1Pf9zCGb5QM + uWFj8rdWesKD1MafT2Ij36zd5srF/vG+rCTn9RPqP5LOBIsIO/1cuy7lXe1qgdq15levnvcO + bnF+PHGGuUKrEktxRqKhFnNRcSIAc3wwQRgDAAA= +Cc: notmuch@notmuchmail.org +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 19 Feb 2012 00:58:14 -0000 + +Quoth Justus Winter on Feb 19 at 12:56 am: +> Previously opening a notmuch database in read write mode that has been +> locked resulted in the notmuch_database_open function executing +> notmuch_database_close as a cleanup function. notmuch_database_close +> failed to check whether the xapian database has in fact been created. +> +> Add a check whether the xapian database object has actually been +> created before trying to call its flush method. +> +> Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de> + +LGTM. Nice catch. + +> --- +> lib/database.cc | 3 ++- +> 1 files changed, 2 insertions(+), 1 deletions(-) +> +> diff --git a/lib/database.cc b/lib/database.cc +> index c928d02..5efa85e 100644 +> --- a/lib/database.cc +> +++ b/lib/database.cc +> @@ -716,7 +716,8 @@ void +> notmuch_database_close (notmuch_database_t *notmuch) +> { +> try { +> - if (notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE) +> + if (notmuch->xapian_db != NULL && +> + notmuch->mode == NOTMUCH_DATABASE_MODE_READ_WRITE) +> (static_cast (notmuch->xapian_db))->flush (); +> } catch (const Xapian::Error &error) { +> if (! notmuch->exception_reported) {