From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Fri, 19 Feb 2021 21:48:27 +0000 (+0000)
Subject: Merge pull request #2753 in SNORT/snort3 from ~ARMANDAV/snort3:oomkill to master
X-Git-Tag: 3.1.2.0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71ad5ec2c0fad0d660ced6bd7a7579ab4031096a;p=thirdparty%2Fsnort3.git

Merge pull request #2753 in SNORT/snort3 from ~ARMANDAV/snort3:oomkill to master

Squashed commit of the following:

commit 41f16cfa0a59259aabc849b50ac39b16868fed88
Author: Arun Mandava <armandav@cisco.com>
Date:   Thu Feb 11 20:50:55 2021 -0500

    memory: free memory space while updating allocation
---

diff --git a/src/flow/flow_data.cc b/src/flow/flow_data.cc
index 470675aed..2caa19aa2 100644
--- a/src/flow/flow_data.cc
+++ b/src/flow/flow_data.cc
@@ -54,7 +54,6 @@ FlowData::~FlowData()
 
 void FlowData::update_allocations(size_t n)
 {
-    memory::MemoryCap::free_space(n);
     memory::MemoryCap::update_allocations(n);
     mem_in_use += n;
 }
diff --git a/src/memory/memory_cap.cc b/src/memory/memory_cap.cc
index 89737f099..86c16ef9d 100644
--- a/src/memory/memory_cap.cc
+++ b/src/memory/memory_cap.cc
@@ -157,6 +157,7 @@ void MemoryCap::update_allocations(size_t n)
 
     size_t k = n;
     n = fudge_it(n);
+    free_space(n);
     mem_stats.total_fudge += (n - k);
     s_tracker.allocate(n);
     auto in_use = s_tracker.used();