X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fdirectory.cc;h=d5015e0ac6f351102b894d0e5efe96f437575408;hb=957ae198e708dc901e3a8c89b7364c2bc75ce371;hp=196f78059ecbace2e347aeb48222c787bf7e4060;hpb=7d8271dd9db5affa9fce589424d6f3b4d8b66cd7;p=notmuch

diff --git a/lib/directory.cc b/lib/directory.cc
index 196f7805..d5015e0a 100644
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -81,12 +81,18 @@ _notmuch_filenames_create (void *ctx,
 notmuch_bool_t
 notmuch_filenames_has_more (notmuch_filenames_t *filenames)
 {
+    if (filenames == NULL)
+	return NULL;
+
     return (filenames->iterator != filenames->end);
 }
 
 const char *
 notmuch_filenames_get (notmuch_filenames_t *filenames)
 {
+    if (filenames == NULL || filenames->iterator == filenames->end)
+	return NULL;
+
     if (filenames->filename == NULL) {
 	std::string term = *filenames->iterator;
 
@@ -101,6 +107,9 @@ notmuch_filenames_get (notmuch_filenames_t *filenames)
 void
 notmuch_filenames_advance (notmuch_filenames_t *filenames)
 {
+    if (filenames == NULL)
+	return;
+
     if (filenames->filename) {
 	talloc_free (filenames->filename);
 	filenames->filename = NULL;
@@ -113,6 +122,9 @@ notmuch_filenames_advance (notmuch_filenames_t *filenames)
 void
 notmuch_filenames_destroy (notmuch_filenames_t *filenames)
 {
+    if (filenames == NULL)
+	return;
+
     talloc_free (filenames);
 }