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

asObject() ignores pointers (6814,5626)

Browse Source
This commit is contained in:
Benoit Blanchon
2022-03-28 12:34:43 +02:00
parent 2d81897371
commit 24f718201b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ArduinoJson/Object/ObjectRef.hpp
View File

@@ -264,7 +264,9 @@ struct Converter<ObjectRef> {
static ObjectRef fromJson(VariantRef src) { static ObjectRef fromJson(VariantRef src) {
VariantData* data = getData(src); VariantData* data = getData(src);
MemoryPool* pool = getPool(src); MemoryPool* pool = getPool(src);
return ObjectRef(pool, data != 0 ? data->asObject() : 0); if (!data)
return ObjectRef();
return ObjectRef(pool, data->asObject());
} }
static InvalidConversion<VariantConstRef, ObjectRef> fromJson( static InvalidConversion<VariantConstRef, ObjectRef> fromJson(

4
src/ArduinoJson/Variant/VariantData.hpp
View File

@@ -108,8 +108,6 @@ class VariantData {
} }
const CollectionData *asObject() const { const CollectionData *asObject() const {
if (isPointer()) // P+20 G+0
return _content.asPointer->asObject();
return const_cast<VariantData *>(this)->asObject(); return const_cast<VariantData *>(this)->asObject();
} }
@@ -321,7 +319,7 @@ class VariantData {
template <typename TAdaptedString> template <typename TAdaptedString>
VariantData *getMember(TAdaptedString key) const { // P+4 G+0 VariantData *getMember(TAdaptedString key) const { // P+4 G+0
const CollectionData *col = asObject(); const CollectionData *col = resolve()->asObject();
return col ? col->getMember(key) : 0; return col ? col->getMember(key) : 0;
} }

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

@@ -24,7 +24,7 @@ inline const CollectionData *variantAsArray(const VariantData *var) {
} }
inline const CollectionData *variantAsObject(const VariantData *var) { inline const CollectionData *variantAsObject(const VariantData *var) {
return var != 0 ? var->asObject() : 0; return var != 0 ? var->resolve()->asObject() : 0;
} }
inline CollectionData *variantAsObject(VariantData *var) { inline CollectionData *variantAsObject(VariantData *var) {