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 4dc4bb00c8a875479a9e8059571f4b0c22254d56..32903fab5c981caa62ad7946b85c8441f08e2e6f 100644 (file)
--- 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 )