lib: catch Xapian exceptions in n_m_count_files

This will require some care for the caller to check the sign, and not
just add error returns into a running total.

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/message.cc b/lib/message.cc
index 364cdc9d..7713050a 100644
--- 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);
 }