From 337665e26a4f0bb0e24a9160f45faf444032bf5d Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 1 Aug 2020 09:25:57 -0300 Subject: [PATCH] lib: catch exceptions in n_directory_get_child_files Also clarify API in error case. --- lib/directory.cc | 12 ++++++++---- lib/notmuch.h | 2 ++ test/T563-lib-directory.sh | 1 - 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/directory.cc b/lib/directory.cc index 5d13afec..79ceea31 100644 --- 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 e59fc571..9a2a3b1f 100644 --- 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 d71c884d..61ed8add 100755 --- 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; -- 2.43.0