From f88a3fa066417893e2455db26e8261d2c6682dcf Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Sat, 4 Jun 2022 08:49:25 +0200 Subject: [PATCH] smtp: simplify preprocess loop (cherry picked from commit 3a631085bb853d6d42c5218235cd9a581a3e106c) --- src/app-layer-smtp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app-layer-smtp.c b/src/app-layer-smtp.c index 146ab7bb9c..d4851ab9fe 100644 --- a/src/app-layer-smtp.c +++ b/src/app-layer-smtp.c @@ -1416,10 +1416,11 @@ static int SMTPProcessRequest(SMTPState *state, Flow *f, static int SMTPPreProcessCommands(SMTPState *state, Flow *f, AppLayerParserState *pstate) { + DEBUG_VALIDATE_BUG_ON((state->parser_state & SMTP_PARSER_STATE_COMMAND_DATA_MODE) == 0); + bool line_complete = false; int32_t input_len = state->input_len; - for (int32_t i = 0; - i < input_len && (state->parser_state & SMTP_PARSER_STATE_COMMAND_DATA_MODE); i++) { + for (int32_t i = 0; i < input_len; i++) { if (state->input[i] == 0x0d) { if (i < input_len - 1 && state->input[i + 1] == 0x0a) { i++; @@ -1454,6 +1455,10 @@ static int SMTPPreProcessCommands(SMTPState *state, Flow *f, AppLayerParserState } line_complete = false; state->current_line_delimiter_len = 0; + + /* bail if `SMTPProcessRequest` ended the data mode */ + if ((state->parser_state & SMTP_PARSER_STATE_COMMAND_DATA_MODE) == 0) + break; } } return 0; -- 2.47.2