From b42c4418a401d6192f9c6e8584bc780bb3ff9960 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Mon, 26 Oct 2009 05:14:51 -0700 Subject: [PATCH] results_get: Fix to return NULL if past the end of the results We had documented both notmuch_thread_results_get and notmuch_message_results_get to return NULL if (! has_more) but we hadn't actually implemented that. Fix. --- query.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/query.cc b/query.cc index b454560a..5fee854c 100644 --- a/query.cc +++ b/query.cc @@ -221,6 +221,9 @@ notmuch_message_results_get (notmuch_message_results_t *results) Xapian::docid doc_id; notmuch_private_status_t status; + if (! notmuch_message_results_has_more (results)) + return NULL; + doc_id = *results->iterator; message = _notmuch_message_create (results, @@ -260,6 +263,9 @@ notmuch_thread_results_get (notmuch_thread_results_t *results) notmuch_thread_t *thread; const char *thread_id; + if (! notmuch_thread_results_has_more (results)) + return NULL; + thread_id = (const char *) g_ptr_array_index (results->thread_ids, results->index); -- 2.26.2