lib/n_m_g_filename: catch Xapian exceptions, document NULL return

[notmuch] / lib / message.cc

diff --git a/lib/message.cc b/lib/message.cc
index 0551a4279cab3b5ebcaaff1de638033d502e2c43..1a9eaffe05e44bca5ba50f83484a2301ca81bd2e 100644 (file)
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1122,7 +1122,12 @@ _notmuch_message_ensure_filename_list (notmuch_message_t *message)
 const char *
 notmuch_message_get_filename (notmuch_message_t *message)
 {
 const char *
 notmuch_message_get_filename (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 NULL;
+    }

 
     if (message->filename_list == NULL)
        return NULL;
 
     if (message->filename_list == NULL)
        return NULL;