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 5D724431FB6 for ; Sat, 28 Jan 2012 21:50:16 -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 Cn77syXHN9CB for ; Sat, 28 Jan 2012 21:50:15 -0800 (PST) Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU [18.9.25.12]) by olra.theworths.org (Postfix) with ESMTP id 805E2431FAE for ; Sat, 28 Jan 2012 21:50:15 -0800 (PST) X-AuditID: 1209190c-b7fad6d000000920-d5-4f24de166a3a Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP id F3.FF.02336.61ED42F4; Sun, 29 Jan 2012 00:50:15 -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 q0T5oE9P029407; Sun, 29 Jan 2012 00:50:14 -0500 Received: from drake.mit.edu (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com [209.6.116.242]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0T5oCHn028024 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Sun, 29 Jan 2012 00:50:13 -0500 (EST) Received: from amthrax by drake.mit.edu with local (Exim 4.77) (envelope-from ) id 1RrNeW-0007ad-5U; Sun, 29 Jan 2012 00:50:12 -0500 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 2/3] lib: Release resources if notmuch_database_open fails Date: Sun, 29 Jan 2012 00:50:09 -0500 Message-Id: <1327816210-29124-2-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1327816210-29124-1-git-send-email-amdragon@mit.edu> References: <1327816210-29124-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6noit+T8XfYPoNJovrN2cyOzB6PFt1 izmAMYrLJiU1J7MstUjfLoEro33GcZaC/ywV216cZW5gbGXpYuTkkBAwkfj87S+ULSZx4d56 ti5GLg4hgX2MEuu3drGCJIQENjBKNP8sh0jcZ5Lonj6NGcKZzyjRcm8LO0gVm4CGxLb9yxlB bBEBaYmdd2cDdXNwMAuoSfzpUgEJCwt4Scw/DlHOIqAq0fntMVg5r4CDRMuzFjaIKxQkzq0+ B1bDKeAo8WfVChaIIxwkGhqnM09g5F/AyLCKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI11AvN7NE LzWldBMjKGg4JXl2ML45qHSIUYCDUYmHV2GFir8Qa2JZcWXuIUZJDiYlUd4Fd4BCfEn5KZUZ icUZ8UWlOanFhxglOJiVRHgdZwLleFMSK6tSi/JhUtIcLErivCpa7/yEBNITS1KzU1MLUotg sjIcHEoSvLPuAjUKFqWmp1akZeaUIKSZODhBhvMADfcAqeEtLkjMLc5Mh8ifYlSUEuedCZIQ AElklObB9cKi+hWjONArwrzdIFU8wIQA1/0KaDAT0OCIq4ogg0sSEVJSDYxTb0/O1Nsm2WIx I6/vifQscbtCuU81RQmviqZcijwlYCQ/4X71WgYJc+2v59ZLTjpq+a9jGq/9C8d1c+fHTePZ qvf87JN5dye5rakVSI4q9wn0+Oz28MHNrCqjjXk74yq0l/05pC+f011b9X/jv8lWeSuW3uMx WzSZXzD2pcFsdp/1ilyWdbOVWIozEg21mIuKEwGo8M8jxQIAAA== 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, 29 Jan 2012 05:50:16 -0000 Previously, if a Xapian exception occurred in notmuch_database_open, we failed to clean up the allocated notmuch_database_t object. --- lib/database.cc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index a6d15a1..94022d7 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -703,6 +703,7 @@ notmuch_database_open (const char *path, } catch (const Xapian::Error &error) { fprintf (stderr, "A Xapian exception occurred opening database: %s\n", error.get_msg().c_str()); + notmuch_database_close (notmuch); notmuch = NULL; } -- 1.7.7.3