bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-30 10:47:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix JsonArrayTests

Browse Source
This commit is contained in:
Benoit Blanchon
2025-06-24 17:45:48 +02:00
parent 22e7ed2d6b
commit 305d5357e1
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ArduinoJson/Array/ArrayImpl.hpp
View File

@ -55,6 +55,8 @@ inline void ArrayImpl::removeElement(size_t index) {
template <typename T> template <typename T>
inline bool ArrayImpl::addValue(const T& value) { inline bool ArrayImpl::addValue(const T& value) {
if (!data_)
return false;
ARDUINOJSON_ASSERT(resources_ != nullptr); ARDUINOJSON_ASSERT(resources_ != nullptr);
auto slot = resources_->allocVariant(); auto slot = resources_->allocVariant();
if (!slot) if (!slot)

4
src/ArduinoJson/Json/JsonDeserializer.hpp
View File

@ -147,7 +147,7 @@ class JsonDeserializer {
template <typename TFilter> template <typename TFilter>
DeserializationError::Code parseArray( DeserializationError::Code parseArray(
ArrayImpl& array, TFilter filter, ArrayImpl array, TFilter filter,
DeserializationOption::NestingLimit nestingLimit) { DeserializationOption::NestingLimit nestingLimit) {
DeserializationError::Code err; DeserializationError::Code err;
@ -233,7 +233,7 @@ class JsonDeserializer {
template <typename TFilter> template <typename TFilter>
DeserializationError::Code parseObject( DeserializationError::Code parseObject(
ObjectImpl& object, TFilter filter, ObjectImpl object, TFilter filter,
DeserializationOption::NestingLimit nestingLimit) { DeserializationOption::NestingLimit nestingLimit) {
DeserializationError::Code err; DeserializationError::Code err;

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

@ -336,8 +336,8 @@ class VariantData {
} }
template <typename TAdaptedString> template <typename TAdaptedString>
static VariantData* getMember(const VariantData* var, TAdaptedString key, static VariantData* getMember(VariantData* var, TAdaptedString key,
const ResourceManager* resources) { ResourceManager* resources) {
if (!var) if (!var)
return 0; return 0;
return var->getMember(key, resources); return var->getMember(key, resources);