debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: make notmuch_threads_valid return FALSE when passed NULL

Browse source 
Without this patch, the example code in the header docs crashes for certain
invalid queries (see id:871u00oimv.fsf@approx.mit.edu)
This commit is contained in:
David Bremner 2014-01-23 08:24:00 -04:00
parent 5c526d1737
commit 29f1252126
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/notmuch.h
View file

@ -802,6 +802,8 @@ notmuch_query_destroy (notmuch_query_t *query);
* valid object. Whereas when this function returns FALSE, * valid object. Whereas when this function returns FALSE,
* notmuch_threads_get will return NULL. * 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 * See the documentation of notmuch_query_search_threads for example
* code showing how to iterate over a notmuch_threads_t object. * code showing how to iterate over a notmuch_threads_t object.
*/ */

3
lib/query.cc
View file

@ -462,6 +462,9 @@ notmuch_threads_valid (notmuch_threads_t *threads)
{ {
unsigned int doc_id; unsigned int doc_id;
if (! threads)
return FALSE;
while (threads->doc_id_pos < threads->doc_ids->len) { while (threads->doc_id_pos < threads->doc_ids->len) {
doc_id = g_array_index (threads->doc_ids, unsigned int, doc_id = g_array_index (threads->doc_ids, unsigned int,
threads->doc_id_pos); threads->doc_id_pos);