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

size() ignores pointers (6796,5602)

Browse Source
This commit is contained in:
Benoit Blanchon
2022-03-30 21:26:47 +02:00
parent d85684ebaa
commit 09b0f20099
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,8 +266,6 @@ class VariantData {
} }
size_t size() const { size_t size() const {
if (isPointer()) // P+0 G+0
return _content.asPointer->size();
return isCollection() ? _content.asCollection.size() : 0; return isCollection() ? _content.asCollection.size() : 0;
} }

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

@@ -58,7 +58,7 @@ inline bool variantSetString(VariantData *var, TAdaptedString value,
} }
inline size_t variantSize(const VariantData *var) { inline size_t variantSize(const VariantData *var) {
return var != 0 ? var->size() : 0; return var != 0 ? var->resolve()->size() : 0;
} }
inline CollectionData *variantToArray(VariantData *var) { inline CollectionData *variantToArray(VariantData *var) {