diff options
| author |  David Bremner <david@tethera.net> | 2014-01-23 08:24:00 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2014-01-24 20:20:54 -0400 |
| commit | 29f125212619ebca8621dd2106b412b22e1b6d22 (patch) | |
| tree | 550c0182e597d81890aaf8ad7d128e58d7be83b7 | |
| parent | 5c526d1737212dd736b1c3fedc6bf5b3493ce436 (diff) | |
lib: make notmuch_threads_valid return FALSE when passed NULL
Without this patch, the example code in the header docs crashes for certain
invalid queries (see id:871u00oimv.fsf@approx.mit.edu)
| -rw-r--r-- | lib/notmuch.h | 2 | ||||
| -rw-r--r-- | lib/query.cc | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/notmuch.h b/lib/notmuch.h index 02604c56..68896ae7 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -802,6 +802,8 @@ notmuch_query_destroy (notmuch_query_t *query); * valid object. Whereas when this function returns FALSE, * notmuch_threads_get will return NULL. * + * If passed a NULL pointer, this function returns FALSE + * * See the documentation of notmuch_query_search_threads for example * code showing how to iterate over a notmuch_threads_t object. */ diff --git a/lib/query.cc b/lib/query.cc index ec60e2e4..60ff8bd9 100644 --- a/lib/query.cc +++ b/lib/query.cc @@ -462,6 +462,9 @@ notmuch_threads_valid (notmuch_threads_t *threads) { unsigned int doc_id; + if (! threads) + return FALSE; + while (threads->doc_id_pos < threads->doc_ids->len) { doc_id = g_array_index (threads->doc_ids, unsigned int, threads->doc_id_pos); |