From e858570afb999c738bb49998974d53001acfa4be Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Sun, 2 Apr 2023 16:51:20 +0200
Subject: [PATCH] Test: change `SpyingAllocator` into a decorator

---
 extras/tests/Helpers/Allocators.hpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/extras/tests/Helpers/Allocators.hpp b/extras/tests/Helpers/Allocators.hpp
index 49e868f3..6c3abbc3 100644
--- a/extras/tests/Helpers/Allocators.hpp
+++ b/extras/tests/Helpers/Allocators.hpp
@@ -84,12 +84,15 @@ class AllocatorLog {
 
 class SpyingAllocator : public ArduinoJson::Allocator {
  public:
+  SpyingAllocator(
+      Allocator* upstream = ArduinoJson::detail::DefaultAllocator::instance())
+      : _upstream(upstream) {}
   virtual ~SpyingAllocator() {}
 
   void* allocate(size_t n) override {
     _log << AllocatorLog::Allocate(n);
     auto block = reinterpret_cast<AllocatedBlock*>(
-        malloc(sizeof(AllocatedBlock) + n - 1));
+        _upstream->allocate(sizeof(AllocatedBlock) + n - 1));
     block->size = n;
     return block->payload;
   }
@@ -97,14 +100,14 @@ class SpyingAllocator : public ArduinoJson::Allocator {
   void deallocate(void* p) override {
     auto block = AllocatedBlock::fromPayload(p);
     _log << AllocatorLog::Deallocate(block->size);
-    free(block);
+    _upstream->deallocate(block);
   }
 
   void* reallocate(void* p, size_t n) override {
     auto block = AllocatedBlock::fromPayload(p);
     _log << AllocatorLog::Reallocate(block->size, n);
     block = reinterpret_cast<AllocatedBlock*>(
-        realloc(block, sizeof(AllocatedBlock) + n - 1));
+        _upstream->reallocate(block, sizeof(AllocatedBlock) + n - 1));
     block->size = n;
     return block->payload;
   }
@@ -128,6 +131,7 @@ class SpyingAllocator : public ArduinoJson::Allocator {
   };
 
   AllocatorLog _log;
+  Allocator* _upstream;
 };
 
 class ControllableAllocator : public ArduinoJson::Allocator {