github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 00:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaced JsonDocument::nestingLimit with a param to deserializeJson()

Browse Source
This commit is contained in:
Benoit Blanchon
2019-01-19 14:45:16 +01:00
parent 30b94493bb
commit e633292df1
11 changed files with 249 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
View File

@@ -327,24 +327,30 @@ class MsgPackDeserializer {
};
template <typename TInput>
DeserializationError deserializeMsgPack(JsonDocument &doc,
const TInput &input) {
return deserialize<MsgPackDeserializer>(doc, input);
DeserializationError deserializeMsgPack(
JsonDocument &doc, const TInput &input,
NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit);
}
template <typename TInput>
DeserializationError deserializeMsgPack(JsonDocument &doc, TInput *input) {
return deserialize<MsgPackDeserializer>(doc, input);
DeserializationError deserializeMsgPack(
JsonDocument &doc, TInput *input,
NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit);
}
template <typename TInput>
DeserializationError deserializeMsgPack(JsonDocument &doc, TInput *input,
size_t inputSize) {
return deserialize<MsgPackDeserializer>(doc, input, inputSize);
DeserializationError deserializeMsgPack(
JsonDocument &doc, TInput *input, size_t inputSize,
NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, inputSize, nestingLimit);
}
template <typename TInput>
DeserializationError deserializeMsgPack(JsonDocument &doc, TInput &input) {
return deserialize<MsgPackDeserializer>(doc, input);
DeserializationError deserializeMsgPack(
JsonDocument &doc, TInput &input,
NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit);
}
} // namespace ARDUINOJSON_NAMESPACE