Re: segfault with xapian 1.3.1

diff --git a/c1/0e9427167abc6481d22bad984118a03132ac9f b/c1/0e9427167abc6481d22bad984118a03132ac9f
new file mode 100644 (file)
index 0000000..65e1c00
--- /dev/null
+++ b/c1/0e9427167abc6481d22bad984118a03132ac9f
@@ -0,0 +1,75 @@
+Return-Path: <olly@survex.com>\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 44E51431FB6\r
+       for <notmuch@notmuchmail.org>; Fri,  6 Sep 2013 16:35:30 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 fypeHTEBJ8-i for <notmuch@notmuchmail.org>;\r
+       Fri,  6 Sep 2013 16:35:25 -0700 (PDT)\r
+X-Greylist: delayed 7525 seconds by postgrey-1.32 at olra;\r
+       Fri, 06 Sep 2013 16:35:25 PDT\r
+Received: from atreus.tartarus.org (atreus.tartarus.org [80.252.125.10])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 617F4431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  6 Sep 2013 16:35:25 -0700 (PDT)\r
+Received: from olly by atreus.tartarus.org with local (Exim 4.69)\r
+       (envelope-from <olly@survex.com>)\r
+       id 1VI3bG-0006LV-Sv; Fri, 06 Sep 2013 22:29:54 +0100\r
+Date: Fri, 6 Sep 2013 22:29:54 +0100\r
+From: Olly Betts <olly@survex.com>\r
+To: David Bremner <david@tethera.net>\r
+Subject: Re: segfault with xapian 1.3.1\r
+Message-ID: <20130906212954.GB31164@survex.com>\r
+References:\r
+ <CAHmME9q3H2KKBRb_VU4Rr-pc+2qR=uPxiX8YPBFE4N0DaiidAA@mail.gmail.com>\r
+       <87txhypzvz.fsf@zancas.localnet> <87r4d2pwv1.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <87r4d2pwv1.fsf@zancas.localnet>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+Cc: notmuch ML <notmuch@notmuchmail.org>\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: Fri, 06 Sep 2013 23:35:30 -0000\r
+\r
+Olly wrote on  IRC:\r
+> bremner: ok, 1.2 explicitly no-oped skip_to() on an iterator at_end on\r
+> trunk that code has been rewritten without that explicit check, and\r
+> the iterator internals are NULL then i think restoring the check is\r
+> reasonable, though I'm not sure if we actually promise that's defined\r
+> behaviour if you want to work with 1.3.1, then checking against the\r
+> end iterator before calling skip_to() will work for any version\r
+\r
+I've put a NULL check in there, and also for the other iterator classes\r
+which use NULL internals to signify being at the end - this only worked\r
+for TermIterator in 1.2.x, but it seems reasonable to make it work in\r
+general and a NULL pointer check isn't a big overhead.\r
+\r
+On Thu, Sep 05, 2013 at 10:22:42PM -0300, David Bremner wrote:\r
+> So, now we know what to fix.\r
+\r
+This should work again in 1.3.2 (once it is out), but if you want to\r
+support 1.3.1 then you need the check.\r
+\r
+Cheers,\r
+    Olly\r