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 7a2882dea2360a87ba3bc511c0cdd3c829de20aa..8f6ef110788fe174def7c9014ad6be2cba3eff9c 100644 (file)
--- 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;
 
 {
     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)) {
     for (key = NOTMUCH_CONFIG_FIRST;
         key < NOTMUCH_CONFIG_LAST;
         key = notmuch_config_key_t (key + 1)) {