From: Victor Julien <victor@inliniac.net>
Date: Mon, 11 Jan 2016 21:46:35 +0000 (-0500)
Subject: smtp: harden mime parsing
X-Git-Tag: suricata-3.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=202b11c0f6215bfee120addf651a7dc30a98f0e5;p=thirdparty%2Fsuricata.git

smtp: harden mime parsing
---

diff --git a/src/app-layer-smtp.c b/src/app-layer-smtp.c
index 61ac4ec645..8afcf25974 100644
--- a/src/app-layer-smtp.c
+++ b/src/app-layer-smtp.c
@@ -767,7 +767,7 @@ static int SMTPProcessCommandDATA(SMTPState *state, Flow *f,
          * the reply received */
         SMTPInsertCommandIntoCommandBuffer(SMTP_COMMAND_DATA_MODE, state, f);
 
-        if (smtp_config.decode_mime) {
+        if (smtp_config.decode_mime && state->curr_tx->mime_state != NULL) {
             /* Complete parsing task */
             int ret = MimeDecParseComplete(state->curr_tx->mime_state);
             if (ret != MIME_DEC_OK) {