lib: catch exceptions in n_directory_get_child_files

Also clarify API in error case.

diff --git a/lib/directory.cc b/lib/directory.cc
index 5d13afecd73a5c9015305ee2aff1c11d004a0b6c..79ceea31c2d4a00ae1579e6bb2fc74dc58a138c3 100644 (file)
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -261,15 +261,19 @@ notmuch_filenames_t *
 notmuch_directory_get_child_files (notmuch_directory_t *directory)
 {
     char *term;
-    notmuch_filenames_t *child_files;
+    notmuch_filenames_t *child_files = NULL;
 
     term = talloc_asprintf (directory, "%s%u:",
                            _find_prefix ("file-direntry"),
                            directory->document_id);
 
-    child_files = _create_filenames_for_terms_with_prefix (directory,
-                                                          directory->notmuch,
-                                                          term);
+    try {
+       child_files = _create_filenames_for_terms_with_prefix (directory,
+                                                              directory->notmuch,
+                                                              term);
+    } catch (Xapian::Error &error) {
+       LOG_XAPIAN_EXCEPTION (directory, error);
+    }
 
     talloc_free (term);
 

diff --git a/lib/notmuch.h b/lib/notmuch.h
index e59fc57183d133d1c77f81bb90fdae65818dde03..9a2a3b1f242420802bc8cbb9d31a372df5594b4d 100644 (file)
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -2148,6 +2148,8 @@ notmuch_directory_get_mtime (notmuch_directory_t *directory);
  *
  * The returned filenames will be the basename-entries only (not
  * complete paths).
+ *
+ * Returns NULL if it triggers a Xapian exception
  */
 notmuch_filenames_t *
 notmuch_directory_get_child_files (notmuch_directory_t *directory);

diff --git a/test/T563-lib-directory.sh b/test/T563-lib-directory.sh
index d71c884d5c355b3e167b84a0227cfcc76478cb97..61ed8addcf108d90ecdb4639890c38a6862274fb 100755 (executable)
--- a/test/T563-lib-directory.sh
+++ b/test/T563-lib-directory.sh
@@ -58,7 +58,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "get child filenames for a closed db"
-test_subtest_known_broken
 cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         notmuch_filenames_t *children;