]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Merge pull request #1562 in SNORT/snort3 from ~NIHDESAI/snort3:flow_fix to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Sun, 31 Mar 2019 23:57:09 +0000 (19:57 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Sun, 31 Mar 2019 23:57:09 +0000 (19:57 -0400)
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

src/file_api/file_flows.cc

index ce066c4d5d7eabb18f8154a0c127c458adc67c97..88377fc7fa0e10e1472bf1d011ee221893412239 100644 (file)
@@ -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;
 }