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

Added an assert to detect too large variants (issue #1414)

Browse Source
This commit is contained in:
Benoit Blanchon
2020-10-23 11:52:21 +02:00
parent 6b26cd0977
commit 9d5c1b3742
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ArduinoJson/Variant/VariantSlot.hpp
View File

@ -6,6 +6,7 @@
#include <stdint.h> // int8_t, int16_t #include <stdint.h> // int8_t, int16_t
#include <ArduinoJson/Polyfills/limits.hpp>
#include <ArduinoJson/Polyfills/type_traits.hpp> #include <ArduinoJson/Polyfills/type_traits.hpp>
#include <ArduinoJson/Strings/StoragePolicy.hpp> #include <ArduinoJson/Strings/StoragePolicy.hpp>
#include <ArduinoJson/Variant/VariantContent.hpp> #include <ArduinoJson/Variant/VariantContent.hpp>
@ -61,11 +62,19 @@ class VariantSlot {
} }
void setNext(VariantSlot* slot) { void setNext(VariantSlot* slot) {
ARDUINOJSON_ASSERT(!slot || slot - this >=
numeric_limits<VariantSlotDiff>::lowest());
ARDUINOJSON_ASSERT(!slot || slot - this <=
numeric_limits<VariantSlotDiff>::highest());
_next = VariantSlotDiff(slot ? slot - this : 0); _next = VariantSlotDiff(slot ? slot - this : 0);
} }
void setNextNotNull(VariantSlot* slot) { void setNextNotNull(VariantSlot* slot) {
ARDUINOJSON_ASSERT(slot != 0); ARDUINOJSON_ASSERT(slot != 0);
ARDUINOJSON_ASSERT(slot - this >=
numeric_limits<VariantSlotDiff>::lowest());
ARDUINOJSON_ASSERT(slot - this <=
numeric_limits<VariantSlotDiff>::highest());
_next = VariantSlotDiff(slot - this); _next = VariantSlotDiff(slot - this);
} }