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

Added string deduplication (closes #1303)

Browse Source
This commit is contained in:
Benoit Blanchon
2020-07-21 20:15:31 +02:00
parent 8ef226bcb8
commit 764ff2cd53
31 changed files with 574 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,8 +212,6 @@ class JsonDeserializer {
// Read each key value pair
for (;;) {
_stringStorage.startString(_pool);
// Parse key
err = parseKey();
if (err)
@@ -233,7 +231,9 @@ class JsonDeserializer {
if (memberFilter.allow()) {
VariantData *variant = object.getMember(adaptString(key));
if (!variant) {
_stringStorage.commit(_pool);
// Save key in memory pool.
// This MUST be done before adding the slot.
key = _stringStorage.save(_pool);
// Allocate slot in object
VariantSlot *slot = object.addSlot(_pool);
@@ -325,6 +325,7 @@ class JsonDeserializer {
}
DeserializationError parseKey() {
_stringStorage.startString(_pool);
if (isQuote(current())) {
return parseQuotedString();
} else {
@@ -337,8 +338,8 @@ class JsonDeserializer {
DeserializationError err = parseQuotedString();
if (err)
return err;
_stringStorage.commit(_pool);
variant.setOwnedString(make_not_null(_stringStorage.c_str()));
const char *value = _stringStorage.save(_pool);
variant.setOwnedString(make_not_null(value));
return DeserializationError::Ok;
}