From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Fri, 6 Apr 2018 23:08:11 +0000 (+0200)
Subject: submission: Actively enforce message size limit while copying message data.
X-Git-Tag: 2.3.2.rc1~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f863c4b7211ade23f056e0b9b885af7d7861021;p=thirdparty%2Fdovecot%2Fcore.git

submission: Actively enforce message size limit while copying message data.
---

diff --git a/src/submission/cmd-data.c b/src/submission/cmd-data.c
index 6b98bde3fe..3b2cfaab8b 100644
--- a/src/submission/cmd-data.c
+++ b/src/submission/cmd-data.c
@@ -76,8 +76,11 @@ int cmd_data_continue(void *conn_ctx, struct smtp_server_cmd_ctx *cmd,
 	size_t size;
 	int ret;
 
-	while ((ret = i_stream_read_more(data_input, &data, &size)) > 0)
+	while ((ret = i_stream_read_more(data_input, &data, &size)) > 0) {
 		i_stream_skip(data_input, size);
+		if (!smtp_server_cmd_data_check_size(cmd))
+			return -1;
+	}
 
 	if (ret == 0)
 		return 0;