From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 07/11] lib/n_m_g_filename: catch Xapian exceptions, document NULL return
Date: Sat, 4 Jul 2020 12:18:01 -0300 [thread overview]
Message-ID: <20200704151805.3717715-8-david@tethera.net> (raw)
In-Reply-To: <20200704151805.3717715-1-david@tethera.net>
This is the same machinery as applied for
notmuch_message_get_{thread,message}_id
---
lib/message.cc | 7 ++++++-
lib/notmuch.h | 2 ++
test/T560-lib-error.sh | 1 -
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/message.cc b/lib/message.cc
index 0551a427..1a9eaffe 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1122,7 +1122,12 @@ _notmuch_message_ensure_filename_list (notmuch_message_t *message)
const char *
notmuch_message_get_filename (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 NULL;
+ }
if (message->filename_list == NULL)
return NULL;
diff --git a/lib/notmuch.h b/lib/notmuch.h
index 037913f4..5c17ec7c 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -1433,6 +1433,8 @@ notmuch_message_count_files (notmuch_message_t *message);
* this function will arbitrarily return a single one of those
* filenames. See notmuch_message_get_filenames for returning the
* complete list of filenames.
+ *
+ * This function returns NULL if it triggers a Xapian exception.
*/
const char *
notmuch_message_get_filename (notmuch_message_t *message);
diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh
index 7555197f..57c74a2b 100755
--- a/test/T560-lib-error.sh
+++ b/test/T560-lib-error.sh
@@ -406,7 +406,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle getting message filename from closed database"
-test_subtest_known_broken
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
const char *filename;
--
2.27.0
next prev parent reply other threads:[~2020-07-04 15:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-04 15:17 Second batch of API cleanup for exception safety David Bremner
2020-07-04 15:17 ` [PATCH 01/11] test: remove unused backup_database calls David Bremner
2020-07-04 15:17 ` [PATCH 02/11] test: drop use of assert in closed db tests David Bremner
2020-07-04 15:17 ` [PATCH 03/11] lib/message: use LOG_XAPIAN_EXCEPTION in n_m_get_header David Bremner
2020-07-04 15:17 ` [PATCH 04/11] test: add regression test for n_m_get_header David Bremner
2020-07-04 15:17 ` [PATCH 05/11] lib/n_m_get_replies: doc return, initial regression test David Bremner
2020-07-04 15:18 ` [PATCH 06/11] lib: add known broken test for notmuch_message_get_filename David Bremner
2020-07-04 15:18 ` David Bremner [this message]
2020-07-04 15:18 ` [PATCH 08/11] test: add known broken test for n_m_get_filenames David Bremner
2020-07-04 15:18 ` [PATCH 09/11] lib: catch exceptions in n_m_get_filenames David Bremner
2020-07-04 15:18 ` [PATCH 10/11] test: add known broken for n_m_get_flag on closed db David Bremner
2020-07-13 10:37 ` David Bremner
2020-07-04 15:18 ` [PATCH 11/11] lib: catch exceptions in n_m_get_flag, provide n_m_get_flag_st David Bremner
2020-07-18 14:32 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200704151805.3717715-8-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).