Throw error when parsed JSON is invalid

Without this error detection, the malformed bootstrap.json stayed undetected. Hence, the old VATSIM FSD HTTP URL was used.
swift-project · Oct 5, 2023 · d29705a · d29705a
1 parent 77d7559
commit d29705a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/resources/share/shared/bootstrap/bootstrap.json b/resources/share/shared/bootstrap/bootstrap.json
@@ -71,5 +71,5 @@
             }
         ]
     },
-    "wasLoadedFromFile": false,
+    "wasLoadedFromFile": false
 }
diff --git a/src/blackmisc/json.cpp b/src/blackmisc/json.cpp
@@ -411,7 +411,14 @@ namespace BlackMisc::Json
     QJsonObject jsonObjectFromString(const QString &json, bool acceptCacheFormat)
     {
         if (json.isEmpty()) { return QJsonObject(); }
-        const QJsonDocument jsonDoc(QJsonDocument::fromJson(json.toUtf8()));
+
+        QJsonParseError error {};
+        const QJsonDocument jsonDoc(QJsonDocument::fromJson(json.toUtf8(), &error));
+        if (error.error != QJsonParseError::NoError)
+        {
+            throw CJsonException(error.errorString());
+        }
+
         return acceptCacheFormat ? Json::unwrapCache(jsonDoc.object()) : jsonDoc.object();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,5 +71,5 @@ @@
                 }
             ]
         },
-        "wasLoadedFromFile": false,
+        "wasLoadedFromFile": false
     }