aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/query.cc
diff options
context:
space:
mode:
authorGravatar Carl Worth <cworth@cworth.org>2010-10-22 17:55:07 -0700
committerGravatar Carl Worth <cworth@cworth.org>2010-10-22 17:56:58 -0700
commitf6cb896bc4c0bafca1acd5ac3fb45169cd893e29 (patch)
tree092db814256b2e1a8f8a1b9bc81769c15c60b32d /lib/query.cc
parent4606ea60a76c11a97e913f87b97d76e64b4bcf0c (diff)
lib: Fix notmuch_query_search_threads to return NULL on any Xapian exception.
Previously, if the underlying search_messages hit an exception and returned NULL, this function would ignore that and return a non-NULL, (but empty) threads object. Fix this to properly propagate the error.
Diffstat (limited to 'lib/query.cc')
-rw-r--r--lib/query.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/query.cc b/lib/query.cc
index d241dc1d..59f4011b 100644
--- 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;