Re: [PATCH 2/2] lib: fix error handling

diff --git a/6a/288b3de4b8b813dbf1cc2e1f82422adf5ccc62 b/6a/288b3de4b8b813dbf1cc2e1f82422adf5ccc62
new file mode 100644 (file)
index 0000000..5c7808d
--- /dev/null
+++ b/6a/288b3de4b8b813dbf1cc2e1f82422adf5ccc62
@@ -0,0 +1,67 @@
+Return-Path: <david@tethera.net>\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 3C950431FC0\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Jan 2014 16:09:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 kOnO6aC-iHqd for <notmuch@notmuchmail.org>;\r
+       Sat, 18 Jan 2014 16:09:26 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id BFCD4431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 18 Jan 2014 16:09:26 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1W4fx7-0003ls-2j; Sat, 18 Jan 2014 20:09:25 -0400\r
+Received: (nullmailer pid 32014 invoked by uid 1000); Sun, 19 Jan 2014\r
+       00:09:21 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Tomi Valkeinen <tomi.valkeinen@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/2] lib: fix error handling\r
+In-Reply-To: <1384837831-9206-2-git-send-email-tomi.valkeinen@iki.fi>\r
+References: <1384837831-9206-1-git-send-email-tomi.valkeinen@iki.fi>\r
+       <1384837831-9206-2-git-send-email-tomi.valkeinen@iki.fi>\r
+User-Agent: Notmuch/0.17+30~g50677dd (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 18 Jan 2014 20:09:21 -0400\r
+Message-ID: <87vbxgg7da.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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, 19 Jan 2014 00:09:28 -0000\r
+\r
+Tomi Valkeinen <tomi.valkeinen@iki.fi> writes:\r
+\r
+> Currently if a Xapian exception happens in notmuch_message_get_header,\r
+> the exception is not caught leading to crash. In\r
+> notmuch_message_get_date the exception is caught, but an internal error\r
+> is raised, again leading to crash.\r
+>\r
+> This patch fixes the error handling by making both functions catch the\r
+> Xapian exceptions, print an error and return NULL or 0.\r
+\r
+pushed,\r
+\r
+thanks\r
+\r
+d\r