From: Timo Sirainen <tss@iki.fi>
Date: Mon, 22 Feb 2010 14:49:08 +0000 (+0200)
Subject: config reading: Don't crash if caller specified module=NULL or service=NULL.
X-Git-Tag: 2.0.beta4~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84fd5bbb0d852ff0ead6ca9c49d3e1a107fb5826;p=thirdparty%2Fdovecot%2Fcore.git

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 0206540ab8..e4a946043c 100644
--- 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 1c7d0b3c6f..87507fd1a8 100644
--- 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 =