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 6b98bde3fe8508d52d4694059554e61ceeec0bbe..3b2cfaab8b55394b470b8400af8fe19d249ae815 100644 (file)
--- 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;