diff --git a/library.json b/library.json index db1ba62..fee4d6d 100644 --- a/library.json +++ b/library.json @@ -12,7 +12,7 @@ "type": "git", "url": "https://github.com/arkhipenko/Dictionary.git" }, - "version": "3.2.0", + "version": "3.2.1", "frameworks": "arduino", "platforms": "*" } diff --git a/library.properties b/library.properties index d6b9ba2..d06a46e 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Dictionary -version=3.2.0 +version=3.2.1 author=Anatoli Arkhipenko maintainer=Anatoli Arkhipenko sentence=A dictionary data type with a fast b-tree based search diff --git a/src/Dictionary.h b/src/Dictionary.h index 1c53031..2e4ed82 100644 --- a/src/Dictionary.h +++ b/src/Dictionary.h @@ -83,6 +83,10 @@ 2020-12-21 - support for comments (#) in imported JSON files bug fix: heap corrupt when missing a comma feature: stricter JSON formatting check + + v3.2.1: + 2021-01-04 - bug fix: import of files with windows-style CR/LF + */ @@ -621,7 +625,7 @@ int8_t Dictionary::jload(String json, int aNum) { isValue = false; continue; } - if ( c == '{' || c == '}' || c == ' ' || c == '\t' ) continue; + if ( c == '{' || c == '}' || c == ' ' || c == '\t' || c == '\r' ) continue; return DICTIONARY_FMT; } }