From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Mon, 19 Dec 2022 19:00:38 +0000 (+0000)
Subject: Pull request #3709: smtp: decline fast-pattern buffer request when flow data is not... 
X-Git-Tag: 3.1.50.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9af32ecfa155c81aa5d836fe43dfab92cc19244;p=thirdparty%2Fsnort3.git

Pull request #3709: smtp: decline fast-pattern buffer request when flow data is not present

Merge in SNORT/snort3 from ~OSHUMEIK/snort3:fix_flow_data_check to master

Squashed commit of the following:

commit fb6ba7116e92a58b804f9fa752abb9a6afa97e81
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Mon Dec 19 14:26:47 2022 +0200

    smtp: decline fast-pattern buffer request when flow data is not present
---

diff --git a/src/service_inspectors/smtp/smtp.cc b/src/service_inspectors/smtp/smtp.cc
index 19737a31c..e43a35c21 100644
--- a/src/service_inspectors/smtp/smtp.cc
+++ b/src/service_inspectors/smtp/smtp.cc
@@ -1583,7 +1583,9 @@ void Smtp::ProcessSmtpCmdsList(const SmtpCmd* sc)
 bool Smtp::get_fp_buf(InspectionBuffer::Type ibt, Packet* p, InspectionBuffer& b)
 {
     SMTPData* smtp_ssn = get_session_data(p->flow);
-    assert(smtp_ssn);
+
+    if (!smtp_ssn)
+        return false;
 
     const void* dst = nullptr;
     size_t dst_len = 0;