diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2017-11-27 22:42:33 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2017-11-28 21:33:14 +0100 |
| commit | 178ecb70987f024f0e775d87c2f8b2cf587dd542 (patch) | |
| tree | 5c0a621c44dc1cbfec1729879aa04093013ee66b | |
| parent | 298f557c4008d1d4aa21df578f334e479e4ae98e (diff) | |
Chunking: do not treat the first lonely dot special. CVE-2017-16944, Bug 2201
| -rw-r--r-- | src/src/receive.c | 2 | ||||
| -rw-r--r-- | src/src/smtp_in.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/src/receive.c b/src/src/receive.c index 541eba138..417e9754f 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -1865,7 +1865,7 @@ for (;;) prevent further reading), and break out of the loop, having freed the empty header, and set next = NULL to indicate no data line. */ - if (ptr == 0 && ch == '.' && (smtp_input || dot_ends)) + if (ptr == 0 && ch == '.' && dot_ends) { ch = (receive_getc)(GETC_BUFFER_UNLIMITED); if (ch == '\r') diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 1fdb705a5..0aabc5356 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -5094,17 +5094,24 @@ while (done <= 0) DEBUG(D_receive) debug_printf("chunking state %d, %d bytes\n", (int)chunking_state, chunking_data_left); + /* push the current receive_* function on the "stack", and + replace them by bdat_getc(), which in turn will use the lwr_receive_* + functions to do the dirty work. */ lwr_receive_getc = receive_getc; lwr_receive_getbuf = receive_getbuf; lwr_receive_ungetc = receive_ungetc; + receive_getc = bdat_getc; receive_ungetc = bdat_ungetc; + dot_ends = FALSE; + goto DATA_BDAT; } case DATA_CMD: HAD(SCH_DATA); + dot_ends = TRUE; DATA_BDAT: /* Common code for DATA and BDAT */ if (!discarded && recipients_count <= 0) |