feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Fix inconsistent pool size in BasicJsonDocument's copy constructor

Browse Source
This commit is contained in:
Benoit Blanchon
2021-11-23 10:49:35 +01:00
parent 2df1bc7d4f
commit b06bbd9d2a
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ HEAD
* Remove `DeserializationError == bool` and `DeserializationError != bool` * Remove `DeserializationError == bool` and `DeserializationError != bool`
* Fix `JsonVariant::memoryUsage()` for raw strings * Fix `JsonVariant::memoryUsage()` for raw strings
* Fix `call of overloaded 'swap(BasicJsonDocument&, BasicJsonDocument&)' is ambiguous` (issue #1678) * Fix `call of overloaded 'swap(BasicJsonDocument&, BasicJsonDocument&)' is ambiguous` (issue #1678)
* Fix inconsistent pool size in `BasicJsonDocument`'s copy constructor
v6.18.5 (2021-09-28) v6.18.5 (2021-09-28)
------- -------

14
extras/tests/JsonDocument/swap.cpp
View File

@ -1,6 +1,7 @@
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <catch.hpp> #include <catch.hpp>
#include <string>
#include <utility> #include <utility>
using namespace std; using namespace std;
@ -10,4 +11,17 @@ TEST_CASE("std::swap") {
DynamicJsonDocument *p1, *p2; DynamicJsonDocument *p1, *p2;
swap(p1, p2); // issue #1678 swap(p1, p2); // issue #1678
} }
SECTION("DynamicJsonDocument") {
DynamicJsonDocument doc1(0x10), doc2(0x20);
doc1.set("hello");
doc2.set("world");
swap(doc1, doc2);
CHECK(doc1.capacity() == 0x20);
CHECK(doc1.as<string>() == "world");
CHECK(doc2.capacity() == 0x10);
CHECK(doc2.as<string>() == "hello");
}
} }

10
src/ArduinoJson/Document/BasicJsonDocument.hpp
View File

@ -98,7 +98,9 @@ class BasicJsonDocument : AllocatorOwner<TAllocator>, public JsonDocument {
template <typename T> template <typename T>
BasicJsonDocument& operator=(const T& src) { BasicJsonDocument& operator=(const T& src) {
reallocPoolIfTooSmall(src.memoryUsage()); size_t requiredSize = src.memoryUsage();
if (requiredSize > capacity())
reallocPool(requiredSize);
set(src); set(src);
return *this; return *this;
} }
@ -136,9 +138,7 @@ class BasicJsonDocument : AllocatorOwner<TAllocator>, public JsonDocument {
return MemoryPool(reinterpret_cast<char*>(this->allocate(capa)), capa); return MemoryPool(reinterpret_cast<char*>(this->allocate(capa)), capa);
} }
void reallocPoolIfTooSmall(size_t requiredSize) { void reallocPool(size_t requiredSize) {
if (requiredSize <= capacity())
return;
freePool(); freePool();
replacePool(allocPool(addPadding(requiredSize))); replacePool(allocPool(addPadding(requiredSize)));
} }
@ -148,7 +148,7 @@ class BasicJsonDocument : AllocatorOwner<TAllocator>, public JsonDocument {
} }
void copyAssignFrom(const JsonDocument& src) { void copyAssignFrom(const JsonDocument& src) {
reallocPoolIfTooSmall(src.capacity()); reallocPool(src.capacity());
set(src); set(src);
} }