lib: catch exceptions in n_directory_get_child_directories

Also clarify API in error case.

diff --git a/lib/directory.cc b/lib/directory.cc
index b9c3d77f663fa3e2b4dbfb596e4e3915546375bc..5d13afecd73a5c9015305ee2aff1c11d004a0b6c 100644 (file)
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -49,6 +49,19 @@ struct _notmuch_directory {
     time_t mtime;
 };
 
+#define LOG_XAPIAN_EXCEPTION(directory, error) _log_xapian_exception (__location__, directory, error)
+
+static void
+_log_xapian_exception (const char *where, notmuch_directory_t *dir,  const Xapian::Error error) {
+    notmuch_database_t *notmuch = dir->notmuch;
+    _notmuch_database_log (notmuch,
+                          "A Xapian exception occurred at %s: %s\n",
+                          where,
+                          error.get_msg ().c_str ());
+    notmuch->exception_reported = true;
+}
+
+
 /* We end up having to call the destructor explicitly because we had
  * to use "placement new" in order to initialize C++ objects within a
  * block that we allocated with talloc. So C++ is making talloc
@@ -267,14 +280,18 @@ notmuch_filenames_t *
 notmuch_directory_get_child_directories (notmuch_directory_t *directory)
 {
     char *term;
-    notmuch_filenames_t *child_directories;
+    notmuch_filenames_t *child_directories = NULL;
 
     term = talloc_asprintf (directory, "%s%u:",
                            _find_prefix ("directory-direntry"),
                            directory->document_id);
 
-    child_directories = _create_filenames_for_terms_with_prefix (directory,
-                                                                directory->notmuch, term);
+    try {
+       child_directories = _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 aaf92470fb67154313182ca76843f9fcfb6afba9..e59fc57183d133d1c77f81bb90fdae65818dde03 100644 (file)
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -2158,6 +2158,8 @@ notmuch_directory_get_child_files (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_directories (notmuch_directory_t *directory);

diff --git a/test/T563-lib-directory.sh b/test/T563-lib-directory.sh
index 15fb8835a13f665b25b7ced0be0bde98b7194d05..5e7da6761c3d2373cea550be26182938cf7d1870 100755 (executable)
--- a/test/T563-lib-directory.sh
+++ b/test/T563-lib-directory.sh
@@ -41,7 +41,6 @@ cat <<'EOF' > c_tail
 EOF
 
 test_begin_subtest "get child directories for a closed db"
-test_subtest_known_broken
 cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         notmuch_filenames_t *children;