From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Mon, 11 Dec 2017 01:19:52 +0000 (+0100)
Subject: lib-smtp: server: DATA/BDAT command: Make sure chunk stream is dereferenced early.
X-Git-Tag: 2.3.0.rc1~148
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f4f829f89c9286f52a5fac8d5f9c22f9994749a;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: server: DATA/BDAT command: Make sure chunk stream is dereferenced early.

The submission BURL command - which uses part of the same code - runs into trouble otherwise.
This could also be an actual istream reference leak outside BURL, but that is not confirmed.
---

diff --git a/src/lib-smtp/smtp-server-cmd-data.c b/src/lib-smtp/smtp-server-cmd-data.c
index 6d18872ae2..2d07dc2384 100644
--- a/src/lib-smtp/smtp-server-cmd-data.c
+++ b/src/lib-smtp/smtp-server-cmd-data.c
@@ -96,8 +96,9 @@ static void cmd_data_destroy(struct smtp_server_cmd_ctx *cmd)
 		/* clean up */
 		i_stream_destroy(&conn->state.data_input);
 		conn->state.data_chain = NULL;
-		i_stream_unref(&data_cmd->chunk_input);
 	}
+
+	i_stream_unref(&data_cmd->chunk_input);
 }
 
 static void cmd_data_replied(struct smtp_server_cmd_ctx *cmd)
@@ -112,6 +113,7 @@ static void cmd_data_completed(struct smtp_server_cmd_ctx *cmd)
 	struct cmd_data_context *data_cmd = command->data;
 
 	i_assert(data_cmd != NULL);
+	i_stream_unref(&data_cmd->chunk_input);
 
 	/* reset state */
 	smtp_server_connection_reset_state(conn);
@@ -137,6 +139,7 @@ cmd_data_chunk_finish(struct smtp_server_cmd_ctx *cmd)
 	struct cmd_data_context *data_cmd = command->data;
 
 	smtp_server_command_input_lock(cmd);
+	i_stream_unref(&data_cmd->chunk_input);
 
 	/* re-check transaction state (for BDAT/B... command) */
 	if (!smtp_server_connection_data_check_state(cmd))