From: David Bremner <david@tethera.net>
Date: Sat, 25 Dec 2021 13:33:04 +0000 (-0400)
Subject: lib/config: make sure the config map exists when loading defaults
X-Git-Tag: 0.35_rc0~44
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=64212c7b91cdb7e65a2a28f994f8d060a50ae78c

lib/config: make sure the config map exists when loading defaults

We should not rely on one of the other "_notmuch_config_load_*"
functions being called before this one.
---

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)) {