From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 15 Mar 2019 19:44:03 +0000 (-0400)
Subject: Merge pull request #1552 in SNORT/snort3 from ~RUCOMBS/snort3:mem_fix to master
X-Git-Tag: 3.0.0-251~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44ff5e7a0c30a39d4db3c2ef3075d3081b054d1c;p=thirdparty%2Fsnort3.git

Merge pull request #1552 in SNORT/snort3 from ~RUCOMBS/snort3:mem_fix to master

Squashed commit of the following:

commit da79c2660cc86ccefbca374de8eb79a4d3bb00e6
Author: russ <rucombs@cisco.com>
Date:   Fri Mar 15 15:46:26 2019 -0400

    memory: fix re-entry check
---

diff --git a/src/memory/memory_cap.cc b/src/memory/memory_cap.cc
index 4dc4bb00c..32903fab5 100644
--- a/src/memory/memory_cap.cc
+++ b/src/memory/memory_cap.cc
@@ -132,7 +132,7 @@ bool MemoryCap::free_space(size_t n)
     if ( !thread_cap )
         return true;
 
-    static bool entered = false;
+    static THREAD_LOCAL bool entered = false;
     assert(!entered);
 
     if ( entered )