diff options
author | David Bremner <david@tethera.net> | 2020-08-01 09:25:57 -0300 |
---|---|---|
committer | David Bremner <david@tethera.net> | 2020-08-03 20:56:09 -0300 |
commit | 337665e26a4f0bb0e24a9160f45faf444032bf5d (patch) | |
tree | a1140eb552a627176ba5a0d29f4fb996189a8300 /lib | |
parent | 3890d989665f5906fa82a10f1a57157c7b23503c (diff) |
lib: catch exceptions in n_directory_get_child_files
Also clarify API in error case.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/directory.cc | 12 | ||||
-rw-r--r-- | lib/notmuch.h | 2 |
2 files changed, 10 insertions, 4 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); |