From: Timo Sirainen <tss@iki.fi>
Date: Thu, 5 Nov 2015 09:41:52 +0000 (+0200)
Subject: auth: Fixed crash when using %{passdb:} or %{userdb:} functions when escape_func... 
X-Git-Tag: 2.2.20.rc1~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c30bcc83aca4e0082c0d28abea72ec309984b06f;p=thirdparty%2Fdovecot%2Fcore.git

auth: Fixed crash when using %{passdb:} or %{userdb:} functions when escape_func was NULL
Patch by Michael Slusarz.
---

diff --git a/src/auth/auth-request-var-expand.c b/src/auth/auth-request-var-expand.c
index 11f78d3328..da80938db6 100644
--- a/src/auth/auth-request-var-expand.c
+++ b/src/auth/auth-request-var-expand.c
@@ -229,7 +229,7 @@ void auth_request_var_expand_with_table(string_t *dest, const char *str,
 
 	memset(&ctx, 0, sizeof(ctx));
 	ctx.auth_request = auth_request;
-	ctx.escape_func = escape_func;
+	ctx.escape_func = escape_func == NULL ? escape_none : escape_func;
 	var_expand_with_funcs(dest, str, table,
 			      auth_request_var_funcs_table, &ctx);
 }