feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Fixed member-call-on-null-pointer in getMember() when array is empty

Browse Source
This commit is contained in:
Benoit Blanchon
2021-04-15 11:30:56 +02:00
parent 88fbe3ac34
commit 898f429826
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@ HEAD
* Changed `JsonVariantConst::is<JsonArray/JsonObject>()` to return `false` (issue #1412) * Changed `JsonVariantConst::is<JsonArray/JsonObject>()` to return `false` (issue #1412)
* Simplified `JsonVariant::as<T>()` to always return `T` (see below) * Simplified `JsonVariant::as<T>()` to always return `T` (see below)
* Updated folders list in `.mbedignore` (PR #1515 by @AGlass0fMilk) * Updated folders list in `.mbedignore` (PR #1515 by @AGlass0fMilk)
* Fixed member-call-on-null-pointer in `getMember()` when array is empty
> ### BREAKING CHANGES > ### BREAKING CHANGES
> >

2
src/ArduinoJson/Collection/CollectionImpl.hpp
View File

@ -115,6 +115,8 @@ inline VariantSlot* CollectionData::getSlot(TAdaptedString key) const {
} }
inline VariantSlot* CollectionData::getSlot(size_t index) const { inline VariantSlot* CollectionData::getSlot(size_t index) const {
if (!_head)
return 0;
return _head->next(index); return _head->next(index);
} }