From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 3/6] lib/tag: handle NULL argument to notmuch_tags_valid
Date: Wed, 25 May 2022 07:51:14 -0300 [thread overview]
Message-ID: <20220525105117.10709-4-david@tethera.net> (raw)
In-Reply-To: <20220525105117.10709-1-david@tethera.net>
Make the behaviour when passed NULL consistent with
notmuch_filenames_valid. The library already passes the result of
notmuch_message_get_tags without checking for NULL, so it should be
handled.
---
lib/notmuch.h | 3 +++
lib/tags.c | 2 +-
test/T565-lib-tags.sh | 1 -
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/notmuch.h b/lib/notmuch.h
index 2e6ec2af..44263a66 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -2262,6 +2262,9 @@ notmuch_message_properties_destroy (notmuch_message_properties_t *properties);
* valid string. Whereas when this function returns FALSE,
* notmuch_tags_get will return NULL.
*
+ * It is acceptable to pass NULL for 'tags', in which case this
+ * function will always return FALSE.
+
* See the documentation of notmuch_message_get_tags for example code
* showing how to iterate over a notmuch_tags_t object.
*/
diff --git a/lib/tags.c b/lib/tags.c
index c7d3f66f..ec5366ff 100644
--- a/lib/tags.c
+++ b/lib/tags.c
@@ -48,7 +48,7 @@ _notmuch_tags_create (const void *ctx, notmuch_string_list_t *list)
notmuch_bool_t
notmuch_tags_valid (notmuch_tags_t *tags)
{
- return tags->iterator != NULL;
+ return tags && (tags->iterator != NULL);
}
const char *
diff --git a/test/T565-lib-tags.sh b/test/T565-lib-tags.sh
index 0f3595d2..2a59f8dd 100755
--- a/test/T565-lib-tags.sh
+++ b/test/T565-lib-tags.sh
@@ -68,7 +68,6 @@ test_expect_equal_file EXPECTED OUTPUT.clean
restore_database
test_begin_subtest "NULL tags are not valid"
-test_subtest_known_broken
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
notmuch_bool_t valid = TRUE;
--
2.35.2
next prev parent reply other threads:[~2022-05-25 10:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-25 10:51 notmuch_message* error handling cleanup part II David Bremner
2022-05-25 10:51 ` [PATCH 1/6] test: error handling for n_m_tags_to_maildir_flags David Bremner
2022-05-25 10:51 ` [PATCH 2/6] test: add known broken test for notmuch_tags_valid (NULL) David Bremner
2022-05-25 10:51 ` David Bremner [this message]
2022-05-25 10:51 ` [PATCH 4/6] lib: Add missing private status values David Bremner
2022-05-25 10:51 ` [PATCH 5/6] lib: add NOTMUCH_STATUS_CLOSED_DATABASE, use in _n_d_ensure_writable David Bremner
2022-05-25 10:51 ` [PATCH 6/6] lib: check for writable db in n_m_tags_maildir_flags David Bremner
2022-06-25 19:38 ` notmuch_message* error handling cleanup part II 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=20220525105117.10709-4-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).