lib: break reference loop by choosing arbitrary top level msg

[notmuch] / lib / thread.cc

diff --git a/lib/thread.cc b/lib/thread.cc
index e17ef63ef48e4657719b0c147835bb86e309f9c0..dbac002fd7130c4c7559dcf96fbb9b90bdab2487 100644 (file)
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -59,12 +59,12 @@ _notmuch_thread_destructor (notmuch_thread_t *thread)
     g_hash_table_unref (thread->message_hash);
 
     if (thread->authors_array) {
-       g_ptr_array_free (thread->authors_array, TRUE);
+       g_ptr_array_free (thread->authors_array, true);
        thread->authors_array = NULL;
     }
 
     if (thread->matched_authors_array) {
-       g_ptr_array_free (thread->matched_authors_array, TRUE);
+       g_ptr_array_free (thread->matched_authors_array, true);
        thread->matched_authors_array = NULL;
     }
 
@@ -156,10 +156,13 @@ _resolve_thread_authors_string (notmuch_thread_t *thread)
        first_non_matched_author = 0;
     }
 
-    g_ptr_array_free (thread->authors_array, TRUE);
+    g_ptr_array_free (thread->authors_array, true);
     thread->authors_array = NULL;
-    g_ptr_array_free (thread->matched_authors_array, TRUE);
+    g_ptr_array_free (thread->matched_authors_array, true);
     thread->matched_authors_array = NULL;
+
+    if (!thread->authors)
+       thread->authors = talloc_strdup(thread, "");
 }
 
 /* clean up the ugly "Lastname, Firstname" format that some mail systems
@@ -239,7 +242,7 @@ _thread_add_message (notmuch_thread_t *thread,
     InternetAddress *address;
     const char *from, *author;
     char *clean_author;
-    notmuch_bool_t message_excluded = FALSE;
+    bool message_excluded = false;
 
     if (omit_exclude != NOTMUCH_EXCLUDE_FALSE) {
        for (tags = notmuch_message_get_tags (message);
@@ -254,7 +257,7 @@ _thread_add_message (notmuch_thread_t *thread,
            {
                /* Check for an empty string, and then ignore initial 'K'. */
                if (*(term->string) && strcmp(tag, (term->string + 1)) == 0) {
-                   message_excluded = TRUE;
+                   message_excluded = true;
                    break;
                }
            }
@@ -310,7 +313,7 @@ _thread_add_message (notmuch_thread_t *thread,
 
     /* Mark excluded messages. */
     if (message_excluded)
-       notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED, TRUE);
+       notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED, true);
 }
 
 static void
@@ -394,7 +397,13 @@ _resolve_thread_relationships (notmuch_thread_t *thread)
     for (node = thread->message_list->head; 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) &&
+       /*
+        * 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
+        */
+       if ((thread->toplevel_list->head || node->next) &&
+            in_reply_to && strlen (in_reply_to) &&
            g_hash_table_lookup_extended (thread->message_hash,
                                          in_reply_to, NULL,
                                          (void **) &parent))