From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 5 May 2021 13:41:21 +0000 (+0300)
Subject: dict-redis: dict-client: Use the proper active ioloop while calling commit() callbacks
X-Git-Tag: 2.3.16~212
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e730ab0b70c4a1c84b7bd84cdde6edb767ca6f0;p=thirdparty%2Fdovecot%2Fcore.git

dict-redis: dict-client: Use the proper active ioloop while calling commit() callbacks

If the callbacks did any IO/timeout changes, they would have gone to a wrong
ioloop. This would have caused a warning about IO/timeout leak though, so
it doesn't seem like there were such code paths currently.
---

diff --git a/src/lib-dict/dict-redis.c b/src/lib-dict/dict-redis.c
index 9ef6faf43e..63ac59eb71 100644
--- a/src/lib-dict/dict-redis.c
+++ b/src/lib-dict/dict-redis.c
@@ -79,6 +79,17 @@ static void redis_input_state_remove(struct redis_dict *dict)
 	array_pop_front(&dict->input_states);
 }
 
+static void redis_reply_callback(struct redis_connection *conn,
+				 const struct redis_dict_reply *reply,
+				 const struct dict_commit_result *result)
+{
+	if (conn->dict->dict.prev_ioloop != NULL)
+		io_loop_set_current(conn->dict->dict.prev_ioloop);
+	reply->callback(result, reply->context);
+	if (conn->dict->dict.prev_ioloop != NULL)
+		io_loop_set_current(conn->dict->dict.ioloop);
+}
+
 static void
 redis_disconnected(struct redis_connection *conn, const char *reason)
 {
@@ -92,7 +103,7 @@ redis_disconnected(struct redis_connection *conn, const char *reason)
 	connection_disconnect(&conn->conn);
 
 	array_foreach(&conn->dict->replies, reply)
-		reply->callback(&result, reply->context);
+		redis_reply_callback(conn, reply, &result);
 	array_clear(&conn->dict->replies);
 	array_clear(&conn->dict->input_states);
 
@@ -247,7 +258,7 @@ redis_conn_input_more(struct redis_connection *conn, const char **error_r)
 			const struct dict_commit_result result = {
 				DICT_COMMIT_RET_OK, NULL
 			};
-			reply->callback(&result, reply->context);
+			redis_reply_callback(conn, reply, &result);
 			array_pop_front(&dict->replies);
 			/* if we're running in a dict-ioloop, we're handling a
 			   synchronous commit and need to stop now */