github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 00:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed "linked" strings incorrectly marked as "owned" (fixes #1318)

Browse Source
This commit is contained in:
Benoit Blanchon
2020-07-24 22:25:56 +02:00
parent 6dc36125c2
commit 4df29fbac1
9 changed files with 75 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
View File

@@ -233,7 +233,8 @@ class MsgPackDeserializer {
const char *s = 0; // <- mute "maybe-uninitialized" (+4 bytes on AVR)
DeserializationError err = readString(s, n);
if (!err)
variant.setOwnedString(make_not_null(s));
variant.setString(make_not_null(s),
typename TStringStorage::storage_policy());
return err;
}
@@ -303,7 +304,7 @@ class MsgPackDeserializer {
DeserializationError err = parseKey(key);
if (err)
return err;
slot->setOwnedKey(make_not_null(key));
slot->setKey(key, typename TStringStorage::storage_policy());
err = parse(*slot->data(), nestingLimit.decrement());
if (err)