From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Mon, 25 Dec 2017 23:38:58 +0000 (+0100)
Subject: lib-smtp: server: Fix assertion failure occurring for a second failed BDAT/BURL command.
X-Git-Tag: 2.3.1~329
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4517f63355c5e503adc25ab09b3c69118ac6fd8f;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: server: Fix assertion failure occurring for a second failed BDAT/BURL command.

Assertion was:

Panic: file smtp-server-cmd-data.c: line 420 (smtp_server_connection_data_chunk_init): assertion failed: (data_cmd->chunk_first)
---

diff --git a/src/lib-smtp/smtp-server-cmd-data.c b/src/lib-smtp/smtp-server-cmd-data.c
index 5e641c3b49..e021382da9 100644
--- a/src/lib-smtp/smtp-server-cmd-data.c
+++ b/src/lib-smtp/smtp-server-cmd-data.c
@@ -416,7 +416,7 @@ void smtp_server_connection_data_chunk_init(struct smtp_server_cmd_ctx *cmd)
 	command->hook_replied = cmd_data_chunk_replied;
 	command->hook_destroy = cmd_data_destroy;
 
-	if (conn->state.data_chain == NULL) {
+	if (!conn->state.data_failed && conn->state.data_chain == NULL) {
 		i_assert(data_cmd->chunk_first);
 		i_assert(conn->state.data_chain_input == NULL);
 		conn->state.data_chain_input =