From 9668583a49e9fe2e39844ceaab20779c9444ba8f Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 1 Aug 2020 09:25:55 -0300 Subject: [PATCH] lib: catch exceptions in n_directory_get_child_directories Also clarify API in error case. --- lib/directory.cc | 23 ++++++++++++++++++++--- lib/notmuch.h | 2 ++ test/T563-lib-directory.sh | 1 - 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lib/directory.cc b/lib/directory.cc index b9c3d77f..5d13afec 100644 --- 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 aaf92470..e59fc571 100644 --- 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 15fb8835..5e7da676 100755 --- 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; -- 2.43.0