From: David Bremner Date: Wed, 25 Apr 2018 20:36:32 +0000 (-0300) Subject: Merge branch 'release' X-Git-Tag: 0.27_rc0~43 X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=963ccabe93b0564e6979433f5be34395e9aa8ef1;hp=20ba0b7dfae2111f76d71c8d695265014c2ef7c5 Merge branch 'release' reference loop fixes to be included in 0.26.2 --- diff --git a/NEWS b/NEWS index 352ce3a7..736d9602 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +Notmuch 0.26.2 (UNRELEASED) +=========================== + +Library Changes +--------------- + +Make thread indexing more robust against reference loops + + Choose a thread root by date in case of reference loops. Fix a + related abort in `notmuch show`. + Notmuch 0.26.1 (2018-04-02) =========================== diff --git a/lib/thread.cc b/lib/thread.cc index 3561b27f..e961c76b 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -390,11 +390,15 @@ _thread_add_matched_message (notmuch_thread_t *thread, static void _resolve_thread_relationships (notmuch_thread_t *thread) { - notmuch_message_node_t *node; + notmuch_message_node_t *node, *first_node; notmuch_message_t *message, *parent; const char *in_reply_to; - for (node = thread->message_list->head; node; node = node->next) { + first_node = thread->message_list->head; + if (! first_node) + return; + + for (node = first_node->next; node; node = node->next) { message = node->message; in_reply_to = _notmuch_message_get_in_reply_to (message); if (in_reply_to && strlen (in_reply_to) && @@ -406,6 +410,25 @@ _resolve_thread_relationships (notmuch_thread_t *thread) _notmuch_message_list_add_message (thread->toplevel_list, message); } + /* + * if we reach the end of the list without finding a top-level + * message, that means the thread is a cycle (or set of cycles) + * and any message can be considered top-level. Choose the oldest + * message, which happens to be first in our list. + */ + if (first_node) { + message = first_node->message; + in_reply_to = _notmuch_message_get_in_reply_to (message); + if (thread->toplevel_list->head && + in_reply_to && strlen (in_reply_to) && + g_hash_table_lookup_extended (thread->message_hash, + in_reply_to, NULL, + (void **) &parent)) + _notmuch_message_add_reply (parent, message); + else + _notmuch_message_list_add_message (thread->toplevel_list, message); + } + /* XXX: After scanning through the entire list looking for parents * via "In-Reply-To", we should do a second pass that looks at the * list of messages IDs in the "References" header instead. (And diff --git a/test/T050-new.sh b/test/T050-new.sh index cd522364..9025fa7a 100755 --- a/test/T050-new.sh +++ b/test/T050-new.sh @@ -354,4 +354,17 @@ exit status: 75 EOF test_expect_equal_file EXPECTED OUTPUT +add_email_corpus broken +test_begin_subtest "reference loop does not crash" +test_expect_code 0 "notmuch show --format=json id:mid-loop-12@example.org id:mid-loop-21@example.org > OUTPUT" + +test_begin_subtest "reference loop ordered by date" +threadid=$(notmuch search --output=threads id:mid-loop-12@example.org) +notmuch show --format=mbox $threadid | grep '^Date' > OUTPUT +cat < EXPECTED +Date: Thu, 16 Jun 2016 22:14:41 -0400 +Date: Fri, 17 Jun 2016 22:14:41 -0400 +EOF +test_expect_equal_file EXPECTED OUTPUT + test_done diff --git a/test/corpora/broken/loop/loop-12 b/test/corpora/broken/loop/loop-12 new file mode 100644 index 00000000..b5c3af7e --- /dev/null +++ b/test/corpora/broken/loop/loop-12 @@ -0,0 +1,8 @@ +From: Alice +To: Daniel +Subject: referencing in-reply-to-loop-21 +Message-ID: +In-Reply-To: +Date: Thu, 16 Jun 2016 22:14:41 -0400 + +Note Message-ID and In-Reply-To: in file in-reply-to-loop-21 diff --git a/test/corpora/broken/loop/loop-21 b/test/corpora/broken/loop/loop-21 new file mode 100644 index 00000000..234f0323 --- /dev/null +++ b/test/corpora/broken/loop/loop-21 @@ -0,0 +1,8 @@ +From: Alice +To: Daniel +Subject: referencing in-reply-to-loop-12 +Message-ID: +In-Reply-To: +Date: Fri, 17 Jun 2016 22:14:41 -0400 + +Note Message-ID and In-Reply-To: in file in-reply-to-loop-12