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

lib: catch Xapian exceptions in n_m_get_tags

Browse source 
This allows the function to return an error value rather than
crashing.
This commit is contained in:
David Bremner 2020-07-05 10:00:19 -03:00
parent d284dc00da
commit 00f1abfdf4
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/message.cc
View file

@ -1206,7 +1206,12 @@ notmuch_message_get_tags (notmuch_message_t *message)
{ {
notmuch_tags_t *tags; notmuch_tags_t *tags;
try {
_notmuch_message_ensure_metadata (message, message->tag_list); _notmuch_message_ensure_metadata (message, message->tag_list);
} catch (Xapian::Error &error) {
LOG_XAPIAN_EXCEPTION (message, error);
return NULL;
}
tags = _notmuch_tags_create (message, message->tag_list); tags = _notmuch_tags_create (message, message->tag_list);
/* _notmuch_tags_create steals the reference to the tag_list, but /* _notmuch_tags_create steals the reference to the tag_list, but

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

@ -471,7 +471,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle getting tags from closed database" test_begin_subtest "Handle getting tags 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_tags_t *result; notmuch_tags_t *result;