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

lib: catch error from closed db in n_m_get_message_id

Browse source 
By catching it at the library top level, we can return an error value.
This commit is contained in:
David Bremner 2020-06-29 22:14:09 -03:00
parent 2c17327ee5
commit 87d462a204
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/message.cc
View file

@ -90,6 +90,18 @@ _notmuch_message_destructor (notmuch_message_t *message)
return 0;
}
#define LOG_XAPIAN_EXCEPTION(message, error) _log_xapian_exception (__location__, message, error)
static void
_log_xapian_exception (const char *where, notmuch_message_t *message, const Xapian::Error error) {
notmuch_database_t *notmuch = notmuch_message_get_database (message);
_notmuch_database_log (notmuch,
"A Xapian exception occurred %s retrieving %s : %s\n",
where,
error.get_msg ().c_str ());
notmuch->exception_reported = true;
}
static notmuch_message_t *
_notmuch_message_create_for_document (const void *talloc_owner,
notmuch_database_t *notmuch,
@ -447,9 +459,6 @@ _notmuch_message_ensure_metadata (notmuch_message_t *message, void *field)
if (status != NOTMUCH_STATUS_SUCCESS)
INTERNAL_ERROR ("unhandled error from notmuch_database_reopen: %s\n",
notmuch_status_to_string (status));
} catch (const Xapian::Error &error) {
INTERNAL_ERROR ("A Xapian exception occurred fetching message metadata: %s\n",
error.get_msg ().c_str ());
}
}
message->last_view = message->notmuch->view;
@ -507,7 +516,13 @@ _notmuch_message_get_doc_id (notmuch_message_t *message)
const char *
notmuch_message_get_message_id (notmuch_message_t *message)
{
_notmuch_message_ensure_metadata (message, message->message_id);
try {
_notmuch_message_ensure_metadata (message, message->message_id);
} catch (const Xapian::Error &error) {
LOG_XAPIAN_EXCEPTION (message, error);
return NULL;
}
if (! message->message_id)
INTERNAL_ERROR ("Message with document ID of %u has no message ID.\n",
message->doc_id);

5
lib/notmuch.h
View file

@ -1363,9 +1363,8 @@ notmuch_message_get_database (const notmuch_message_t *message);
* message is valid, (which is until the query from which it derived
* is destroyed).
*
* This function will not return NULL since Notmuch ensures that every
* message has a unique message ID, (Notmuch will generate an ID for a
* message if the original file does not contain one).
* This function will return NULL if triggers an unhandled Xapian
* exception.
*/
const char *
notmuch_message_get_message_id (notmuch_message_t *message);

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

@ -343,7 +343,6 @@ EOF
backup_database
test_begin_subtest "Handle getting message-id from closed database"
test_subtest_known_broken
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
const char *id2;