config reading: Don't crash if caller specified module=NULL or service=NULL.

--HG--
branch : HEAD

diff --git a/src/lib-master/master-service-settings-cache.c b/src/lib-master/master-service-settings-cache.c
index 0206540ab89768b6f11d51786577c68fc0b715ab..e4a946043ca3a5ed48e4ca3d74cb1ef6a9af21a9 100644 (file)
--- a/src/lib-master/master-service-settings-cache.c
+++ b/src/lib-master/master-service-settings-cache.c
@@ -252,8 +252,8 @@ int master_service_settings_cache_read(struct master_service_settings_cache *cac
        struct master_service_settings_output output;
        const struct master_service_settings *set;
 
-       i_assert(strcmp(input->module, cache->module) == 0);
-       i_assert(strcmp(input->service, cache->service_name) == 0);
+       i_assert(null_strcmp(input->module, cache->module) == 0);
+       i_assert(null_strcmp(input->service, cache->service_name) == 0);
 
        if (cache_find(cache, input, parser_r))
                return 0;

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 1c7d0b3c6ff3d0e7379c20563eaddaf92295a91b..87507fd1a89311d0db0ec9e08f771922cbd8a421 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -631,8 +631,8 @@ int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx,
                                                  &ctx->set_cache_dyn_parsers);
        }
 
-       if (strcmp(input->module, ctx->set_cache_module) == 0 &&
-           strcmp(input->service, ctx->set_cache_service) == 0) {
+       if (null_strcmp(input->module, ctx->set_cache_module) == 0 &&
+           null_strcmp(input->service, ctx->set_cache_service) == 0) {
                set_input.roots = ctx->set_cache_roots;
                set_input.dyn_parsers = ctx->set_cache_dyn_parsers;
                set_input.dyn_parsers_parent =