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

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

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