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

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/Variant/VariantImpl.hpp
View File

@@ -26,7 +26,7 @@ inline T VariantData::asIntegral() const {
return convertNumber<T>(_content.asSignedInteger);
case VALUE_IS_LINKED_STRING:
case VALUE_IS_OWNED_STRING:
return parseNumber<T>(_content.asString);
return parseNumber<T>(_content.asString.data);
case VALUE_IS_FLOAT:
return convertNumber<T>(_content.asFloat);
default:
@@ -62,7 +62,7 @@ inline T VariantData::asFloat() const {
return static_cast<T>(_content.asSignedInteger);
case VALUE_IS_LINKED_STRING:
case VALUE_IS_OWNED_STRING:
return parseNumber<T>(_content.asString);
return parseNumber<T>(_content.asString.data);
case VALUE_IS_FLOAT:
return static_cast<T>(_content.asFloat);
default:
@@ -73,11 +73,11 @@ inline T VariantData::asFloat() const {
inline String VariantData::asString() const {
switch (type()) {
case VALUE_IS_LINKED_STRING:
return String(_content.asString, true);
return String(_content.asString.data, _content.asString.size, true);
case VALUE_IS_OWNED_STRING:
return String(_content.asString, false);
return String(_content.asString.data, _content.asString.size, false);
default:
return 0;
return String();
}
}