dovecot-2.0-sslstream: settings parser: Don't crash if trying to...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0-sslstream/rev/988ea1049fa5
changeset: 10229:988ea1049fa5
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Oct 29 14:09:10 2009 -0400
description:
settings parser: Don't crash if trying to expand a setting under strlist.

diffstat:

1 file changed, 4 insertions(+)
src/lib-settings/settings-parser.c |    4 ++++

diffs (14 lines):

diff -r 89d924850fb1 -r 988ea1049fa5 src/lib-settings/settings-parser.c
--- a/src/lib-settings/settings-parser.c	Thu Oct 29 13:59:30 2009 -0400
+++ b/src/lib-settings/settings-parser.c	Thu Oct 29 14:09:10 2009 -0400
@@ -834,6 +834,10 @@ void settings_parse_set_key_expandeded(s
 
 	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) {