From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Fri, 14 Jan 2022 03:01:29 +0000 (+0100)
Subject: submission: submission-backend-relay - Fix segfault in QUIT command client-side destr... 
X-Git-Tag: 2.3.19~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f05ce17585b29dd6b7046a0816adffb396e5f7c;p=thirdparty%2Fdovecot%2Fcore.git

submission: submission-backend-relay - Fix segfault in QUIT command client-side destruction.
---

diff --git a/src/submission/submission-backend-relay.c b/src/submission/submission-backend-relay.c
index cc8a6797f8..6d93b64257 100644
--- a/src/submission/submission-backend-relay.c
+++ b/src/submission/submission-backend-relay.c
@@ -958,6 +958,14 @@ relay_cmd_quit_destroy(struct smtp_server_cmd_ctx *cmd ATTR_UNUSED,
 		smtp_client_command_abort(&quit_cmd->cmd_relayed);
 }
 
+static void relay_cmd_quit_relayed_destroy(void *context)
+{
+	struct relay_cmd_quit_context *quit_cmd = context;
+
+	i_assert(quit_cmd != NULL);
+	quit_cmd->cmd_relayed = NULL;
+}
+
 static void
 relay_cmd_quit_replied(struct smtp_server_cmd_ctx *cmd ATTR_UNUSED,
 		       struct relay_cmd_quit_context *quit_cmd)
@@ -1010,6 +1018,9 @@ static void relay_cmd_quit_relay(struct relay_cmd_quit_context *quit_cmd)
 		smtp_client_command_new(backend->conn, 0,
 					relay_cmd_quit_callback, quit_cmd);
 	smtp_client_command_write(quit_cmd->cmd_relayed, "QUIT");
+	smtp_client_command_set_abort_callback(
+		quit_cmd->cmd_relayed,
+		relay_cmd_quit_relayed_destroy, quit_cmd);
 	smtp_client_command_submit(quit_cmd->cmd_relayed);
 }