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

Fix memory leak in JsonDeserializer when object key is repeated

Browse Source
This commit is contained in:
Benoit Blanchon
2023-05-25 09:21:54 +02:00
parent 48acf963fb
commit da45c4bc4f
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/tests/JsonDeserializer/object.cpp
View File

@ -7,6 +7,7 @@
using ArduinoJson::detail::sizeofArray; using ArduinoJson::detail::sizeofArray;
using ArduinoJson::detail::sizeofObject; using ArduinoJson::detail::sizeofObject;
using ArduinoJson::detail::sizeofString;
TEST_CASE("deserialize JSON object") { TEST_CASE("deserialize JSON object") {
JsonDocument doc(4096); JsonDocument doc(4096);
@ -281,6 +282,7 @@ TEST_CASE("deserialize JSON object") {
REQUIRE(err == DeserializationError::Ok); REQUIRE(err == DeserializationError::Ok);
REQUIRE(doc["a"] == 2); REQUIRE(doc["a"] == 2);
REQUIRE(doc.memoryUsage() == 3 * sizeofObject(1) + sizeofString(1));
} }
SECTION("Repeated key with zero copy mode") { // issue #1697 SECTION("Repeated key with zero copy mode") { // issue #1697

2
src/ArduinoJson/Json/JsonDeserializer.hpp
View File

@ -285,6 +285,8 @@ class JsonDeserializer {
slot->setKey(savedKey); slot->setKey(savedKey);
object.add(slot); object.add(slot);
} else {
variantRelease(slot->data(), pool_);
} }
// Parse value // Parse value