debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: catch Xapian exceptions in n_m_count_files

Browse source 
This will require some care for the caller to check the sign, and not
just add error returns into a running total.
This commit is contained in:
David Bremner 2020-07-05 10:00:21 -03:00
parent 6dc62d8bea
commit 96befd0dd0
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/message.cc
View file

@ -1156,7 +1156,12 @@ notmuch_message_get_filenames (notmuch_message_t *message)
int
notmuch_message_count_files (notmuch_message_t *message)
{
_notmuch_message_ensure_filename_list (message);
try {
_notmuch_message_ensure_filename_list (message);
} catch (Xapian::Error &error) {
LOG_XAPIAN_EXCEPTION (message, error);
return -1;
}
return _notmuch_string_list_length (message->filename_list);
}

3
lib/notmuch.h
View file

@ -1412,7 +1412,8 @@ notmuch_message_get_replies (notmuch_message_t *message);
/**
* Get the total number of files associated with a message.
* @returns Non-negative integer
* @returns Non-negative integer for file count.
* @returns Negative integer for error.
* @since libnotmuch 5.0 (notmuch 0.25)
*/
int

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

@ -487,7 +487,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle counting files from closed database"
test_subtest_known_broken
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
int result;