From: David Bremner <david@tethera.net>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Subject: [PATCH 5/6] lib/config: make sure the config map exists when loading defaults
Date: Sat, 25 Dec 2021 09:33:04 -0400 [thread overview]
Message-ID: <20211225133305.3014272-3-david@tethera.net> (raw)
In-Reply-To: <20211225133305.3014272-1-david@tethera.net>
We should not rely on one of the other "_notmuch_config_load_*"
functions being called before this one.
---
lib/config.cc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/config.cc b/lib/config.cc
index 7a2882de..8f6ef110 100644
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -658,6 +658,9 @@ _notmuch_config_load_defaults (notmuch_database_t *notmuch)
{
notmuch_config_key_t key;
+ if (notmuch->config == NULL)
+ notmuch->config = _notmuch_string_map_create (notmuch);
+
for (key = NOTMUCH_CONFIG_FIRST;
key < NOTMUCH_CONFIG_LAST;
key = notmuch_config_key_t (key + 1)) {
--
2.34.1
next prev parent reply other threads:[~2021-12-25 13:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-11 12:49 [PATCH 1/2] test/libconfig: save and restore config file David Bremner
2021-12-11 12:49 ` [PATCH 2/2] test/libconfig: add two tests for the config = "" case David Bremner
2021-12-25 13:33 ` [PATCH 3/6] lib/open: use db struct as talloc ctx for choose_database_path David Bremner
2021-12-25 13:33 ` [PATCH 4/6] lib/open: use notmuch->params to track split status David Bremner
2021-12-25 13:33 ` David Bremner [this message]
2021-12-25 13:33 ` [PATCH 6/6] lib/open: no default mail root in split configurations David Bremner
2022-01-16 1:56 ` [PATCH 1/2] test/libconfig: save and restore config file 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=20211225133305.3014272-3-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).