From: Bhargava Jandhyala (bjandhya) <bjandhya@cisco.com>
Date: Tue, 14 Sep 2021 06:33:00 +0000 (+0000)
Subject: Merge pull request #3051 in SNORT/snort3 from ~BSACHDEV/snort3:smb_crash to master
X-Git-Tag: 3.1.13.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2231c0a15201bdb29f8310dfdfc552d2f6c801d5;p=thirdparty%2Fsnort3.git

Merge pull request #3051 in SNORT/snort3 from ~BSACHDEV/snort3:smb_crash to master

Squashed commit of the following:

commit 8ce04eac431afcc03615fd2e6cda04d6a88522d3
Author: bsachdev <bsachdev@cisco.com>
Date:   Wed Sep 8 00:43:10 2021 -0400

    smb: added a null check when current_flow is not present

    Signed-off-by: bsachdev <bsachdev@cisco.com>
---

diff --git a/src/service_inspectors/dce_rpc/dce_smb2_file.cc b/src/service_inspectors/dce_rpc/dce_smb2_file.cc
index 9e1344773..798087405 100644
--- a/src/service_inspectors/dce_rpc/dce_smb2_file.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb2_file.cc
@@ -151,6 +151,8 @@ bool Dce2Smb2FileTracker::process_data(const uint32_t current_flow_key, const ui
     uint32_t data_size)
 {
     Dce2Smb2SessionData* current_flow = parent_tree->get_parent()->get_flow(current_flow_key);
+    if (!current_flow)
+        return true;
 
     if (parent_tree->get_share_type() != SMB2_SHARE_TYPE_DISK)
     {