08/8a7cd44ba4d7238da67433e6b9257defe360f9

   1 Return-Path: <amthrax@drake.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 5D724431FB6\r
   6         for <notmuch@notmuchmail.org>; Sat, 28 Jan 2012 21:50:16 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \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 Cn77syXHN9CB for <notmuch@notmuchmail.org>;\r
  16         Sat, 28 Jan 2012 21:50:15 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
  18         [18.9.25.12])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 805E2431FAE\r
  20         for <notmuch@notmuchmail.org>; Sat, 28 Jan 2012 21:50:15 -0800 (PST)\r
  21 X-AuditID: 1209190c-b7fad6d000000920-d5-4f24de166a3a\r
  22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  23         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id F3.FF.02336.61ED42F4; Sun, 29 Jan 2012 00:50:15 -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 q0T5oE9P029407; \r
  27         Sun, 29 Jan 2012 00:50:14 -0500\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0T5oCHn028024\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 29 Jan 2012 00:50:13 -0500 (EST)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1RrNeW-0007ad-5U; Sun, 29 Jan 2012 00:50:12 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 2/3] lib: Release resources if notmuch_database_open fails\r
  41 Date: Sun, 29 Jan 2012 00:50:09 -0500\r
  42 Message-Id: <1327816210-29124-2-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.7.3\r
  44 In-Reply-To: <1327816210-29124-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1327816210-29124-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6noit+T8XfYPoNJovrN2cyOzB6PFt1\r
  48         izmAMYrLJiU1J7MstUjfLoEro33GcZaC/ywV216cZW5gbGXpYuTkkBAwkfj87S+ULSZx4d56\r
  49         ti5GLg4hgX2MEuu3drGCJIQENjBKNP8sh0jcZ5Lonj6NGcKZzyjRcm8LO0gVm4CGxLb9yxlB\r
  50         bBEBaYmdd2cDdXNwMAuoSfzpUgEJCwt4Scw/DlHOIqAq0fntMVg5r4CDRMuzFjaIKxQkzq0+\r
  51         B1bDKeAo8WfVChaIIxwkGhqnM09g5F/AyLCKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI11AvN7NE\r
  52         LzWldBMjKGg4JXl2ML45qHSIUYCDUYmHV2GFir8Qa2JZcWXuIUZJDiYlUd4Fd4BCfEn5KZUZ\r
  53         icUZ8UWlOanFhxglOJiVRHgdZwLleFMSK6tSi/JhUtIcLErivCpa7/yEBNITS1KzU1MLUotg\r
  54         sjIcHEoSvLPuAjUKFqWmp1akZeaUIKSZODhBhvMADfcAqeEtLkjMLc5Mh8ifYlSUEuedCZIQ\r
  55         AElklObB9cKi+hWjONArwrzdIFU8wIQA1/0KaDAT0OCIq4ogg0sSEVJSDYxTb0/O1Nsm2WIx\r
  56         I6/vifQscbtCuU81RQmviqZcijwlYCQ/4X71WgYJc+2v59ZLTjpq+a9jGq/9C8d1c+fHTePZ\r
  57         qvf87JN5dye5rakVSI4q9wn0+Oz28MHNrCqjjXk74yq0l/05pC+f011b9X/jv8lWeSuW3uMx\r
  58         WzSZXzD2pcFsdp/1ilyWdbOVWIozEg21mIuKEwGo8M8jxQIAAA==\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Sun, 29 Jan 2012 05:50:16 -0000\r
  72 \r
  73 Previously, if a Xapian exception occurred in notmuch_database_open,\r
  74 we failed to clean up the allocated notmuch_database_t object.\r
  75 ---\r
  76  lib/database.cc |    1 +\r
  77  1 files changed, 1 insertions(+), 0 deletions(-)\r
  78 \r
  79 diff --git a/lib/database.cc b/lib/database.cc\r
  80 index a6d15a1..94022d7 100644\r
  81 --- a/lib/database.cc\r
  82 +++ b/lib/database.cc\r
  83 @@ -703,6 +703,7 @@ notmuch_database_open (const char *path,\r
  84      } catch (const Xapian::Error &error) {\r
  85         fprintf (stderr, "A Xapian exception occurred opening database: %s\n",\r
  86                  error.get_msg().c_str());\r
  87 +       notmuch_database_close (notmuch);\r
  88         notmuch = NULL;\r
  89      }\r
  90  \r
  91 -- \r
  92 1.7.7.3\r
  93 \r