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

Improved coverage of JsonDeserializer

Browse Source
This commit is contained in:
Benoit Blanchon
2020-02-17 09:15:34 +01:00
parent 85499be855
commit 1902c0ec93
6 changed files with 234 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -299,7 +299,9 @@ class JsonDeserializer {
// Skip spaces
err = skipSpacesAndComments();
if (err)
return err; // Colon
return err;
// Colon
if (!eat(':'))
return DeserializationError::InvalidInput;
@@ -393,8 +395,7 @@ class JsonDeserializer {
StringBuilder builder = _stringStorage.startString();
char c = current();
if (c == '\0')
return DeserializationError::IncompleteInput;
ARDUINOJSON_ASSERT(c);
if (canBeInNonQuotedString(c)) { // no quotes
do {
@@ -482,7 +483,7 @@ class JsonDeserializer {
DeserializationError skipNumericValue() {
char c = current();
while (c && c != '}' && c != ',' && c != ']' && c != ':') {
while (canBeInNonQuotedString(c)) {
move();
c = current();
}