From: Bhargava Jandhyala (bjandhya) <bjandhya@cisco.com>
Date: Thu, 24 Dec 2020 05:48:56 +0000 (+0000)
Subject: Merge pull request #2685 in SNORT/snort3 from ~VKAMBALA/snort3:vkambala to master
X-Git-Tag: 3.1.0.0~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d85bd4abb87c0237cd4651d1ae8eb864edbc8de;p=thirdparty%2Fsnort3.git

Merge pull request #2685 in SNORT/snort3 from ~VKAMBALA/snort3:vkambala to master

Squashed commit of the following:

commit 76711cb440bcab2b58522e661f99762d22b05b38
Author: krishnakanth <vkambala@cisco.com>
Date:   Tue Dec 22 01:10:13 2020 -0500

    dce_rpc: Handling Flow from File inspection
---

diff --git a/src/service_inspectors/dce_rpc/dce_smb2_commands.cc b/src/service_inspectors/dce_rpc/dce_smb2_commands.cc
index a7a81672f..6645c41ff 100644
--- a/src/service_inspectors/dce_rpc/dce_smb2_commands.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb2_commands.cc
@@ -127,7 +127,7 @@ bool DCE2_Smb2ProcessFileData(DCE2_Smb2SsnData* ssd, const uint8_t* file_data,
     }
 
     if (!file_flows->file_process(p, ssd->ftracker_tcp->file_name_hash, file_data, data_size,
-        ssd->ftracker_tcp->file_offset, dir, ssd->ftracker_tcp->file_id))
+        ssd->ftracker_tcp->file_offset, dir, ssd->ftracker_tcp->file_id) and detection_size)
     {
         debug_logf(dce_smb_trace, p, "file_process completed\n");