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

asString() ignores pointers (6814,5626)

Browse Source
This commit is contained in:
Benoit Blanchon
2022-03-28 12:27:59 +02:00
parent b5f840c0d1
commit 2d81897371
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ArduinoJson/Variant/ConverterImpl.hpp
View File

@@ -124,7 +124,9 @@ struct Converter<const char*> {
static const char* fromJson(VariantConstRef src) { static const char* fromJson(VariantConstRef src) {
const VariantData* data = getData(src); const VariantData* data = getData(src);
return data ? data->asString().c_str() : 0; if (!data)
return 0;
return data->resolve()->asString().c_str();
} }
static bool checkJson(VariantConstRef src) { static bool checkJson(VariantConstRef src) {
@@ -142,7 +144,9 @@ struct Converter<String> {
static String fromJson(VariantConstRef src) { static String fromJson(VariantConstRef src) {
const VariantData* data = getData(src); const VariantData* data = getData(src);
return data ? data->asString() : 0; if (!data)
return String();
return data->resolve()->asString();
} }
static bool checkJson(VariantConstRef src) { static bool checkJson(VariantConstRef src) {

2
src/ArduinoJson/Variant/VariantImpl.hpp
View File

@@ -80,8 +80,6 @@ inline String VariantData::asString() const {
case VALUE_IS_OWNED_STRING: case VALUE_IS_OWNED_STRING:
return String(_content.asString.data, _content.asString.size, return String(_content.asString.data, _content.asString.size,
String::Copied); String::Copied);
case VALUE_IS_POINTER: // P+16 G+0
return _content.asPointer->asString();
default: default:
return String(); return String();
} }