Fix: skip BOM in JSON files (pin_mapping and config)

hoylabs · Oct 29, 2024 · 993f321 · 993f321
1 parent 3c1d3f7
commit 993f321
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
@@ -397,6 +397,13 @@ bool ConfigurationClass::read()
 {
     File f = LittleFS.open(CONFIG_FILENAME, "r", false);
 
+    // skip Byte Order Mask (BOM). valid JSON docs always start with '{' or '['.
+    while (f.available() > 0) {
+        int c = f.peek();
+        if (c == '{' || c == '[') { break; }
+        f.read();
+    }
+
     JsonDocument doc;
 
     // Deserialize the JSON document

diff --git a/src/PinMapping.cpp b/src/PinMapping.cpp
@@ -321,6 +321,13 @@ bool PinMappingClass::init(const String& deviceMapping)
         return false;
     }
 
+    // skip Byte Order Mask (BOM). valid JSON docs always start with '{' or '['.
+    while (f.available() > 0) {
+        int c = f.peek();
+        if (c == '{' || c == '[') { break; }
+        f.read();
+    }
+
     JsonDocument doc;
     // Deserialize the JSON document
     DeserializationError error = deserializeJson(doc, f);