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

asBoolean() ignores pointers (6796,5626)

Browse Source
This commit is contained in:
Benoit Blanchon
2022-03-28 12:44:45 +02:00
parent d7eef30e6c
commit ddb5e1177c
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/ConverterImpl.hpp
View File

@@ -85,7 +85,7 @@ struct Converter<bool> {
static bool fromJson(VariantConstRef src) { static bool fromJson(VariantConstRef src) {
const VariantData* data = getData(src); const VariantData* data = getData(src);
return data ? data->asBoolean() : false; return data ? data->resolve()->asBoolean() : false;
} }
static bool checkJson(VariantConstRef src) { static bool checkJson(VariantConstRef src) {

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

@@ -45,8 +45,6 @@ inline bool VariantData::asBoolean() const {
return _content.asFloat != 0; return _content.asFloat != 0;
case VALUE_IS_NULL: case VALUE_IS_NULL:
return false; return false;
case VALUE_IS_POINTER: // P+0 G+0
return _content.asPointer->asBoolean();
default: default:
return true; return true;
} }