v2.3.1 - bug fix: support for windows eol

arkhipenko · Jan 4, 2021 · 3a9f0c4 · 3a9f0c4
1 parent 608a19e
commit 3a9f0c4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -1,5 +1,5 @@
 name=Dictionary
-version=3.2.0
+version=3.2.1
 author=Anatoli Arkhipenko <[email protected]>
 maintainer=Anatoli Arkhipenko <[email protected]>
 sentence=A dictionary data type with a fast b-tree based search

diff --git 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;
           }
         }