From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 17 Nov 2020 12:41:31 +0000 (+0200)
Subject: dict-sql: Support dict_iterate_values()
X-Git-Tag: 2.3.14.rc1~327
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd6caf4f540b368b10c676366f25bcb10cb8fb08;p=thirdparty%2Fdovecot%2Fcore.git

dict-sql: Support dict_iterate_values()
---

diff --git a/src/lib-dict-backend/dict-sql.c b/src/lib-dict-backend/dict-sql.c
index f2027b9926..252c6098c3 100644
--- a/src/lib-dict-backend/dict-sql.c
+++ b/src/lib-dict-backend/dict-sql.c
@@ -50,7 +50,6 @@ struct sql_dict_iterate_context {
 	bool synchronous_result;
 	bool iter_query_sent;
 	bool allow_null_map; /* allow next map to be NULL */
-	const char *values[2];
 	const char *error;
 };
 
@@ -867,9 +866,8 @@ static bool sql_dict_iterate(struct dict_iterate_context *_ctx,
 
 	*key_r = str_c(ctx->key);
 	if ((ctx->flags & DICT_ITERATE_FLAG_NO_VALUE) == 0) {
-		ctx->values[0] = sql_dict_result_unescape_value(ctx->map,
-					pool_datastack_create(), ctx->result);
-		*values_r = ctx->values;
+		*values_r = sql_dict_result_unescape_values(ctx->map,
+			pool_datastack_create(), ctx->result);
 	}
 	return TRUE;
 }