From: Timo Sirainen <tss@iki.fi>
Date: Thu, 29 Oct 2009 18:09:10 +0000 (-0400)
Subject: settings parser: Don't crash if trying to expand a setting under strlist.
X-Git-Tag: 2.0.alpha3~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c63f8a67eb97b22bd9d49113d532b6e9498a3c7b;p=thirdparty%2Fdovecot%2Fcore.git

settings parser: Don't crash if trying to expand a setting under strlist.

--HG--
branch : HEAD
---

diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c
index fb82844468..b961848d8b 100644
--- a/src/lib-settings/settings-parser.c
+++ b/src/lib-settings/settings-parser.c
@@ -834,6 +834,10 @@ void settings_parse_set_key_expandeded(struct setting_parser_context *ctx,
 
 	if (!settings_find_key(ctx, key, &def, &link))
 		return;
+	if (link->info == &strlist_info) {
+		/* parent is strlist, no expansion needed */
+		return;
+	}
 
 	val = PTR_OFFSET(link->set_struct, def->offset);
 	if (def->type == SET_STR_VARS && *val != NULL) {