debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: catch exceptions in n_m_get_filenames

Browse source 
This is essentially copied from the change to notmuch_message_get_filename
This commit is contained in:
David Bremner 2020-07-04 11:09:09 -03:00
parent 2c2ba7d6e2
commit 286161b703
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/message.cc
View file

@ -1143,7 +1143,12 @@ notmuch_message_get_filename (notmuch_message_t *message)
notmuch_filenames_t * notmuch_filenames_t *
notmuch_message_get_filenames (notmuch_message_t *message) notmuch_message_get_filenames (notmuch_message_t *message)
{ {
try {
_notmuch_message_ensure_filename_list (message); _notmuch_message_ensure_filename_list (message);
} catch (Xapian::Error &error) {
LOG_XAPIAN_EXCEPTION (message, error);
return NULL;
}
return _notmuch_filenames_create (message, message->filename_list); return _notmuch_filenames_create (message, message->filename_list);
} }

2
lib/notmuch.h
View file

@ -1448,6 +1448,8 @@ notmuch_message_get_filename (notmuch_message_t *message);
* *
* Each filename in the iterator is an absolute filename, (the initial * Each filename in the iterator is an absolute filename, (the initial
* component will match notmuch_database_get_path() ). * component will match notmuch_database_get_path() ).
*
* This function returns NULL if it triggers a Xapian exception.
*/ */
notmuch_filenames_t * notmuch_filenames_t *
notmuch_message_get_filenames (notmuch_message_t *message); notmuch_message_get_filenames (notmuch_message_t *message);

1
test/T560-lib-error.sh
View file

@ -422,7 +422,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle getting all message filenames from closed database" test_begin_subtest "Handle getting all message filenames from closed database"
test_subtest_known_broken
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{ {
notmuch_filenames_t *filenames; notmuch_filenames_t *filenames;