[PATCH v3 4/4] new: Fix missing end_atomic in remove_filename on error

diff --git a/4e/c86f2714a9422b94b5e43b0284b83f9376a778 b/4e/c86f2714a9422b94b5e43b0284b83f9376a778
new file mode 100644 (file)
index 0000000..3cc6d20
--- /dev/null
+++ b/4e/c86f2714a9422b94b5e43b0284b83f9376a778
@@ -0,0 +1,108 @@
+Return-Path: <amthrax@drake.mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 5AFE9431FB6\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 08:51:00 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id xa6cSWzGXZZj for <notmuch@notmuchmail.org>;\r
+       Sun, 22 Apr 2012 08:50:59 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+       [18.9.25.13])\r
+       by olra.theworths.org (Postfix) with ESMTP id E2E2A431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 08:50:58 -0700 (PDT)\r
+X-AuditID: 1209190d-b7fbf6d0000008ba-a0-4f9428e2cf72\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id EE.83.02234.2E8249F4; Sun, 22 Apr 2012 11:50:58 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q3MFovEf023025; \r
+       Sun, 22 Apr 2012 11:50:57 -0400\r
+Received: from drake.mit.edu\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q3MFou5B003695\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 22 Apr 2012 11:50:57 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1SLz3w-0002fJ-Ni; Sun, 22 Apr 2012 11:50:56 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 4/4] new: Fix missing end_atomic in remove_filename on\r
+ error\r
+Date: Sun, 22 Apr 2012 11:50:52 -0400\r
+Message-Id: <1335109852-10150-5-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1335109852-10150-1-git-send-email-amdragon@mit.edu>\r
+References: <1330357759-1337-1-git-send-email-amdragon@mit.edu>\r
+       <1335109852-10150-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixG6nrvtIY4q/wbYOHYvrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoErY8LfR4wFRzgqjr/7y9rA+Imti5GTQ0LAROLPm81QtpjEhXvr\r
+       gWwuDiGBfYwSh198gHI2MErMWv6RGcK5zyRx+vVmKGc+o8TGFRfZQfrZBDQktu1fzghiiwhI\r
+       S+y8O5u1i5GDg1lATeJPlwpIWFjAX2LP7WawEhYBVYn+9p2sIDavgIPE2jU9rBBnKEg8W3ec\r
+       CcTmFHCU+PhuJZgtJFAm8W3eW/YJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Rrp5WaW\r
+       6KWmlG5iBIUNpyTvDsZ3B5UOMQpwMCrx8L40mewvxJpYVlyZe4hRkoNJSZTXTW2KvxBfUn5K\r
+       ZUZicUZ8UWlOavEhRgkOZiUR3s8iQOW8KYmVValF+TApaQ4WJXFeVa13fkIC6YklqdmpqQWp\r
+       RTBZGQ4OJQlec2B8CAkWpaanVqRl5pQgpJk4OEGG8wANtwap4S0uSMwtzkyHyJ9iVJQS51UG\r
+       SQiAJDJK8+B6YXH9ilEc6BVh3hCQKh5gSoDrfgU0mAlocELMJJDBJYkIKakGxuvLOSUnLTXW\r
+       LH8tVp4x9X3cNdETC2SjNl9d3xpbmqBxzeZNh+zubdqGijf2VbIbdKxb+DnvweJH+svdn15V\r
+       V/uUybjU9NqcNIff/lck1r69u5/bxdeIt2xRfEdDybSCA5lJC5n2TTGe+e/n3/T0j/6q/pOn\r
+       emzOFT4dt69SKP3NzLtHn/8y+K/EUpyRaKjFXFScCACwV9RzxgIAAA==\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 22 Apr 2012 15:51:00 -0000\r
+\r
+Previously, if we failed to find the message by filename in\r
+remove_filename, we would return immediately from the function without\r
+ending its atomic block.  Now this code follows the usual goto DONE\r
+idiom to perform cleanup.\r
+---\r
+ notmuch-new.c |    5 ++++-\r
+ 1 files changed, 4 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index bf9b120..473201e 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -779,7 +779,8 @@ remove_filename (notmuch_database_t *notmuch,\r
+       return status;\r
+     status = notmuch_database_find_message_by_filename (notmuch, path, &message);\r
+     if (status || message == NULL)\r
+-      return status;\r
++      goto DONE;\r
++\r
+     status = notmuch_database_remove_message (notmuch, path);\r
+     if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {\r
+       add_files_state->renamed_messages++;\r
+@@ -790,6 +791,8 @@ remove_filename (notmuch_database_t *notmuch,\r
+       add_files_state->removed_messages++;\r
+     }\r
+     notmuch_message_destroy (message);\r
++\r
++  DONE:\r
+     notmuch_database_end_atomic (notmuch);\r
+     return status;\r
+ }\r
+-- \r
+1.7.9.1\r
+\r