aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mime: allow partial lines as input

Browse Source 
If we get a zero length delim we assume its a partial line and we
won't append CRLF just yet.
pull/7282/head
Victor Julien 4 years ago
parent cf749fd450
commit 6e800a8548
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
src/util-decode-mime.c
Unescape Escape View File

@ -1463,8 +1463,8 @@ static int ProcessQuotedPrintableBodyLine(const uint8_t *buf, uint32_t len,
state->data_chunk_len++; state->data_chunk_len++;
entity->decoded_body_len += 1; entity->decoded_body_len += 1;
/* Add CRLF sequence if end of line */ /* Add CRLF sequence if end of line, unless its a partial line */
if (remaining == 1) { if (remaining == 1 && state->current_line_delimiter_len > 0) {
memcpy(state->data_chunk + state->data_chunk_len, CRLF, EOL_LEN); memcpy(state->data_chunk + state->data_chunk_len, CRLF, EOL_LEN);
state->data_chunk_len += EOL_LEN; state->data_chunk_len += EOL_LEN;
entity->decoded_body_len += EOL_LEN; entity->decoded_body_len += EOL_LEN;
@ -1501,8 +1501,8 @@ static int ProcessQuotedPrintableBodyLine(const uint8_t *buf, uint32_t len,
state->data_chunk_len++; state->data_chunk_len++;
entity->decoded_body_len++; entity->decoded_body_len++;
/* Add CRLF sequence if end of line */ /* Add CRLF sequence if end of line, unless for partial lines */
if (remaining == 3) { if (remaining == 3 && state->current_line_delimiter_len > 0) {
memcpy(state->data_chunk + state->data_chunk_len, memcpy(state->data_chunk + state->data_chunk_len,
CRLF, EOL_LEN); CRLF, EOL_LEN);
state->data_chunk_len += EOL_LEN; state->data_chunk_len += EOL_LEN;
@ -1591,8 +1591,8 @@ static int ProcessBodyLine(const uint8_t *buf, uint32_t len,
memcpy(state->data_chunk + state->data_chunk_len, buf + offset, tobuf); memcpy(state->data_chunk + state->data_chunk_len, buf + offset, tobuf);
state->data_chunk_len += tobuf; state->data_chunk_len += tobuf;
/* Now always add a CRLF to the end */ /* Now always add a CRLF to the end, unless its a partial line */
if (tobuf == remaining) { if (tobuf == remaining && state->current_line_delimiter_len > 0) {
memcpy(state->data_chunk + state->data_chunk_len, CRLF, EOL_LEN); memcpy(state->data_chunk + state->data_chunk_len, CRLF, EOL_LEN);
state->data_chunk_len += EOL_LEN; state->data_chunk_len += EOL_LEN;
} }

Write Preview
Loading…
Cancel
Save