debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-31 13:51:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: catch exceptions in n_directory_get_child_directories

Browse source 
Also clarify API in error case.
This commit is contained in:
David Bremner 2020-08-01 09:25:55 -03:00
parent 919b89156c
commit 9668583a49
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/directory.cc
View file

@ -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);

2
lib/notmuch.h
View file

@ -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);

1
test/T563-lib-directory.sh
View file

@ -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;