From 746f2882f75e9f03bbe6ccbcb90899512768a383 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 5 Mar 2019 14:48:33 +0100 Subject: [PATCH] Removed member call on null --- src/ArduinoJson/Collection/CollectionImpl.hpp | 2 +- src/ArduinoJson/Variant/SlotFunctions.hpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ArduinoJson/Collection/CollectionImpl.hpp b/src/ArduinoJson/Collection/CollectionImpl.hpp index 42d734dc..c6097e47 100644 --- a/src/ArduinoJson/Collection/CollectionImpl.hpp +++ b/src/ArduinoJson/Collection/CollectionImpl.hpp @@ -26,7 +26,7 @@ inline VariantSlot* CollectionData::addSlot(MemoryPool* pool) { } inline VariantData* CollectionData::add(MemoryPool* pool) { - return addSlot(pool)->data(); + return slotData(addSlot(pool)); } template diff --git a/src/ArduinoJson/Variant/SlotFunctions.hpp b/src/ArduinoJson/Variant/SlotFunctions.hpp index 41e0ead9..e34f4aa2 100644 --- a/src/ArduinoJson/Variant/SlotFunctions.hpp +++ b/src/ArduinoJson/Variant/SlotFunctions.hpp @@ -32,4 +32,8 @@ inline size_t slotSize(const VariantSlot* var) { } return n; } + +inline VariantData* slotData(VariantSlot* slot) { + return reinterpret_cast(slot); +} } // namespace ARDUINOJSON_NAMESPACE