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

Support NUL inside string values (issue #1646)

Browse Source
This commit is contained in:
Benoit Blanchon
2021-11-21 15:07:56 +01:00
parent a27398e445
commit be70f6ddd7
22 changed files with 144 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ArduinoJson/Memory/MemoryPool.hpp
View File

@@ -62,12 +62,12 @@ class MemoryPool {
template <typename TAdaptedString>
const char* saveString(const TAdaptedString& str) {
if (str.isNull())
return 0;
return CopiedString();
#if ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
const char* existingCopy = findString(str);
if (existingCopy)
return existingCopy;
return CopiedString(existingCopy, str.size());
#endif
size_t n = str.size();
@@ -77,7 +77,7 @@ class MemoryPool {
str.copyTo(newCopy, n);
newCopy[n] = 0; // force null-terminator
}
return newCopy;
return CopiedString(newCopy, n);
}
void getFreeZone(char** zoneStart, size_t* zoneSize) const {
@@ -89,14 +89,14 @@ class MemoryPool {
#if ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
const char* dup = findString(adaptString(_left, len));
if (dup)
return dup;
return CopiedString(dup, len);
#endif
const char* str = _left;
_left += len;
*_left++ = 0;
checkInvariants();
return str;
return CopiedString(str, len);
}
void markAsOverflowed() {