Fixed DynamicJsonBuffer::clear() not resetting allocation size (fixes bblanchon#561)

bblanchon · bblanchon · commit 57defe00ee5a · 2017-08-30T21:51:10.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 ArduinoJson: change log
 =======================
 
+HEAD
+----
+
+* Fixed `DynamicJsonBuffer::clear()` not resetting allocation size (issue #561)
+
 v5.11.1
 -------
 
diff --git a/src/ArduinoJson/DynamicJsonBuffer.hpp b/src/ArduinoJson/DynamicJsonBuffer.hpp
@@ -52,7 +52,7 @@ class DynamicJsonBufferBase
       : _head(NULL), _nextBlockCapacity(initialSize) {}
 
   ~DynamicJsonBufferBase() {
-    freeAllBlocks();
+    clear();
   }
 
   // Gets the number of bytes occupied in the buffer
@@ -71,7 +71,13 @@ class DynamicJsonBufferBase
   // Resets the buffer.
   // USE WITH CAUTION: this invalidates all previously allocated data
   void clear() {
-    freeAllBlocks();
+    Block* currentBlock = _head;
+    while (currentBlock != NULL) {
+      _nextBlockCapacity = currentBlock->capacity;
+      Block* nextBlock = currentBlock->next;
+      _allocator.deallocate(currentBlock);
+      currentBlock = nextBlock;
+    }
     _head = 0;
   }
 
@@ -144,16 +150,6 @@ class DynamicJsonBufferBase
     return true;
   }
 
-  void freeAllBlocks() {
-    Block* currentBlock = _head;
-
-    while (currentBlock != NULL) {
-      Block* nextBlock = currentBlock->next;
-      _allocator.deallocate(currentBlock);
-      currentBlock = nextBlock;
-    }
-  }
-
   TAllocator _allocator;
   Block* _head;
   size_t _nextBlockCapacity;
diff --git a/test/DynamicJsonBuffer/alloc.cpp b/test/DynamicJsonBuffer/alloc.cpp
@@ -46,7 +46,7 @@ TEST_CASE("DynamicJsonBuffer::alloc()") {
     REQUIRE(allocatorLog.str() == "A1A2FF");
   }
 
-  SECTION("Keeps increasing allocation size after clear") {
+  SECTION("Resets allocation size after clear()") {
     allocatorLog.str("");
     {
       DynamicJsonBufferBase<SpyingAllocator> buffer(1);
@@ -55,7 +55,7 @@ TEST_CASE("DynamicJsonBuffer::alloc()") {
       buffer.clear();
       buffer.alloc(1);
     }
-    REQUIRE(allocatorLog.str() == "A1A2FFA4F");
+    REQUIRE(allocatorLog.str() == "A1A2FFA1F");
   }
 
   SECTION("Makes a big allocation when needed") {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ TEST_CASE("DynamicJsonBuffer::alloc()") {`
`46`	`46`	`REQUIRE(allocatorLog.str() == "A1A2FF");`
`47`	`47`	`}`
`48`	`48`
`49`		`- SECTION("Keeps increasing allocation size after clear") {`
	`49`	`+ SECTION("Resets allocation size after clear()") {`
`50`	`50`	`allocatorLog.str("");`
`51`	`51`	`{`
`52`	`52`	`DynamicJsonBufferBase<SpyingAllocator> buffer(1);`
`@@ -55,7 +55,7 @@ TEST_CASE("DynamicJsonBuffer::alloc()") {`
`55`	`55`	`buffer.clear();`
`56`	`56`	`buffer.alloc(1);`
`57`	`57`	`}`
`58`		`- REQUIRE(allocatorLog.str() == "A1A2FFA4F");`
	`58`	`+ REQUIRE(allocatorLog.str() == "A1A2FFA1F");`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`SECTION("Makes a big allocation when needed") {`