From aa8e3f4487897f0c650dc37d99153099c3d3df5e Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 5 Jul 2020 10:00:25 -0300 Subject: [PATCH] lib: catch Xapian exceptions in n_m_remove_tag The churn here is again mainly re-indentation. --- lib/message.cc | 33 +++++++++++++++++++-------------- test/T560-lib-error.sh | 1 - 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/lib/message.cc b/lib/message.cc index 62a181c1..e4848f83 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -1623,24 +1623,29 @@ notmuch_message_remove_tag (notmuch_message_t *message, const char *tag) notmuch_private_status_t private_status; notmuch_status_t status; - status = _notmuch_database_ensure_writable (message->notmuch); - if (status) - return status; + try { + status = _notmuch_database_ensure_writable (message->notmuch); + if (status) + return status; - if (tag == NULL) - return NOTMUCH_STATUS_NULL_POINTER; + if (tag == NULL) + return NOTMUCH_STATUS_NULL_POINTER; - if (strlen (tag) > NOTMUCH_TAG_MAX) - return NOTMUCH_STATUS_TAG_TOO_LONG; + if (strlen (tag) > NOTMUCH_TAG_MAX) + return NOTMUCH_STATUS_TAG_TOO_LONG; - private_status = _notmuch_message_remove_term (message, "tag", tag); - if (private_status) { - INTERNAL_ERROR ("_notmuch_message_remove_term return unexpected value: %d\n", - private_status); - } + private_status = _notmuch_message_remove_term (message, "tag", tag); + if (private_status) { + INTERNAL_ERROR ("_notmuch_message_remove_term return unexpected value: %d\n", + private_status); + } - if (! message->frozen) - _notmuch_message_sync (message); + if (! message->frozen) + _notmuch_message_sync (message); + } catch (Xapian::Error &error) { + LOG_XAPIAN_EXCEPTION (message, error); + return NOTMUCH_STATUS_XAPIAN_EXCEPTION; + } return NOTMUCH_STATUS_SUCCESS; } diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh index ce83bc96..ebace888 100755 --- a/test/T560-lib-error.sh +++ b/test/T560-lib-error.sh @@ -519,7 +519,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "Handle removing tag with closed database" -test_subtest_known_broken cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} { notmuch_status_t status; -- 2.43.0