From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Wed, 24 Jun 2020 08:42:17 +0000 (+0200)
Subject: lib-smtp: smtp-server-command - Reliably end input capture in smtp_server_command_inp... 
X-Git-Tag: 2.3.13~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6ec5245d4957fb723f9c2611bc76c1f6843e9bc;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: smtp-server-command - Reliably end input capture in smtp_server_command_input_unlock().
---

diff --git a/src/lib-smtp/smtp-server-command.c b/src/lib-smtp/smtp-server-command.c
index 8281d18b6d..68643f8c33 100644
--- a/src/lib-smtp/smtp-server-command.c
+++ b/src/lib-smtp/smtp-server-command.c
@@ -709,9 +709,7 @@ void smtp_server_command_finished(struct smtp_server_command *cmd)
 		smtp_server_command_unref(&cmd);
 		return;
 	} else if (cmd->input_locked) {
-		if (cmd->input_captured)
-			smtp_server_connection_input_halt(conn);
-		smtp_server_connection_input_resume(conn);
+		smtp_server_command_input_unlock(&cmd->context);
 	}
 
 	smtp_server_command_unref(&cmd);
@@ -767,6 +765,10 @@ void smtp_server_command_input_unlock(struct smtp_server_cmd_ctx *cmd)
 	struct smtp_server_connection *conn = cmd->conn;
 
 	command->input_locked = FALSE;
+	if (command->input_captured) {
+		command->input_captured = FALSE;
+		smtp_server_connection_input_halt(conn);
+	}
 	smtp_server_connection_input_resume(conn);
 }