lib: Fix notmuch_query_search_threads to return NULL on any Xapian exception.

[notmuch] / lib / query.cc

diff --git a/lib/query.cc b/lib/query.cc
index d241dc1dc819a6246e2bfc791330c5448dc9548e..59f4011b31d3a3f5616227d352b8f7234b05ee0f 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -249,6 +249,10 @@ notmuch_query_search_threads (notmuch_query_t *query)
                                              free, NULL);
 
     threads->messages = notmuch_query_search_messages (query);
+    if (threads->messages == NULL) {
+           talloc_free (threads);
+           return NULL;
+    }
 
     threads->thread_id = NULL;