lib: catch Xapian exceptions in n_m_count_files

[notmuch] / lib / message.cc

diff --git a/lib/message.cc b/lib/message.cc
index 364cdc9d4e86764ddd5502f5e0034c1424a555ac..7713050a78a9d97c3a8ac9043fe1e807ae9804af 100644 (file)
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1156,7 +1156,12 @@ notmuch_message_get_filenames (notmuch_message_t *message)
 int
 notmuch_message_count_files (notmuch_message_t *message)
 {
-    _notmuch_message_ensure_filename_list (message);
+    try {
+       _notmuch_message_ensure_filename_list (message);
+    } catch (Xapian::Error &error) {
+       LOG_XAPIAN_EXCEPTION (message, error);
+       return -1;
+    }
 
     return _notmuch_string_list_length (message->filename_list);
 }