juce_core: Fix infinite allocation loop in AllocationHooks

juce-framework · Feb 28, 2024 · 29f2991 · 29f2991
1 parent e265be5
commit 29f2991
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/modules/juce_core/memory/juce_AllocationHooks.cpp b/modules/juce_core/memory/juce_AllocationHooks.cpp
@@ -33,10 +33,8 @@ static AllocationHooks& getAllocationHooksForThread()
 
 void notifyAllocationHooksForThread()
 {
-    getAllocationHooksForThread().listenerList.call ([] (AllocationHooks::Listener& l)
-    {
-        l.newOrDeleteCalled();
-    });
+    if (auto* l = getAllocationHooksForThread().listener)
+        l->newOrDeleteCalled();
 }
 
 }
@@ -84,12 +82,12 @@ namespace juce
 UnitTestAllocationChecker::UnitTestAllocationChecker (UnitTest& test)
     : unitTest (test)
 {
-    getAllocationHooksForThread().addListener (this);
+    getAllocationHooksForThread().setListener (this);
 }
 
 UnitTestAllocationChecker::~UnitTestAllocationChecker() noexcept
 {
-    getAllocationHooksForThread().removeListener (this);
+    getAllocationHooksForThread().setListener (nullptr);
     unitTest.expectEquals ((int) calls, 0, "new or delete was incorrectly called while allocation checker was active");
 }
 

diff --git a/modules/juce_core/memory/juce_AllocationHooks.h b/modules/juce_core/memory/juce_AllocationHooks.h
@@ -34,12 +34,11 @@ class AllocationHooks
         virtual void newOrDeleteCalled() noexcept = 0;
     };
 
-    void addListener    (Listener* l)          { listenerList.add (l); }
-    void removeListener (Listener* l) noexcept { listenerList.remove (l); }
+    void setListener (Listener* l) { listener = l; }
 
 private:
     friend void notifyAllocationHooksForThread();
-    ListenerList<Listener> listenerList;
+    Listener* listener = nullptr;
 };
 
 //==============================================================================