From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 6 Feb 2019 19:54:26 +0000 (+0100)
Subject: lib-smtp: smtp-client - Send correct size value for BDAT command when the data lacks CR.
X-Git-Tag: 2.3.6~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=630453b05a08dbda2a0064f62e2040d1ca95f5ba;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: smtp-client - Send correct size value for BDAT command when the data lacks CR.

The addition of CR was ignored in the size specification because the original
unaltered stream was used for the size calculations.
---

diff --git a/src/lib-smtp/smtp-client-command.c b/src/lib-smtp/smtp-client-command.c
index 8a5486ba06..fe575cf585 100644
--- a/src/lib-smtp/smtp-client-command.c
+++ b/src/lib-smtp/smtp-client-command.c
@@ -1401,7 +1401,7 @@ smtp_client_command_data_submit_after(
 
 	} else {
 		/* BDAT */
-		ctx->data = i_stream_create_crlf(data);
+		ctx->data = data = i_stream_create_crlf(data);
 
 		p_array_init(&ctx->cmds, ctx->pool,
 			conn->set.max_data_chunk_pipeline);