From: Lokesh Bevinamarad (lbevinam) <lbevinam@cisco.com>
Date: Mon, 2 Nov 2020 11:46:38 +0000 (+0000)
Subject: Merge pull request #2593 in SNORT/snort3 from ~KBHANDAN/snort3:crunch_crash to master
X-Git-Tag: 3.0.3-5~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25262b2397aef67cdb6c8d28b47fd85b887050a9;p=thirdparty%2Fsnort3.git

Merge pull request #2593 in SNORT/snort3 from ~KBHANDAN/snort3:crunch_crash to master

Squashed commit of the following:

commit e515bbe448f601c91e70a283a62b71277e855331
Author: Kaushal Bhandankar <kbhandan@cisco.com>
Date:   Sun Nov 1 23:02:04 2020 -0500

    flow: Return correct type from the release stub method
---

diff --git a/src/flow/test/flow_control_test.cc b/src/flow/test/flow_control_test.cc
index 5515374f1..fec727c0b 100644
--- a/src/flow/test/flow_control_test.cc
+++ b/src/flow/test/flow_control_test.cc
@@ -169,7 +169,7 @@ int ExpectCache::add_flow(const Packet*,
     return 1;
 }
 
-bool FlowCache::release(Flow*, PruneReason, bool) { }
+bool FlowCache::release(Flow*, PruneReason, bool) { return true; }
 
 TEST_GROUP(stale_flow) { };