From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Sun, 31 Mar 2019 23:57:09 +0000 (-0400)
Subject: Merge pull request #1562 in SNORT/snort3 from ~NIHDESAI/snort3:flow_fix to master
X-Git-Tag: 3.0.0-251~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9330787381dc8b417b90a6bc1d569146fdb4b62b;p=thirdparty%2Fsnort3.git

Merge pull request #1562 in SNORT/snort3 from ~NIHDESAI/snort3:flow_fix to master

Squashed commit of the following:

commit 64a3be8975133ead29b22aa49ca3598c9e6077ed
Author: Nihal Desai <nihdesai@cisco.com>
Date:   Fri Mar 29 12:08:23 2019 -0400

    file: Infinite loop in FileFlows::get_file_policy
---

diff --git a/src/file_api/file_flows.cc b/src/file_api/file_flows.cc
index ce066c4d5..88377fc7f 100644
--- a/src/file_api/file_flows.cc
+++ b/src/file_api/file_flows.cc
@@ -111,7 +111,7 @@ FilePolicyBase* FileFlows::get_file_policy(Flow* flow)
     FileFlows* fd = (FileFlows*)flow->get_flow_data(FileFlows::file_flow_data_id);
 
     if (fd)
-        return fd->get_file_policy(flow);
+        return fd->get_file_policy();
 
     return nullptr;
 }