flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 12:35:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Throw error when parsed JSON is invalid

Browse Source 
Without this error detection, the malformed bootstrap.json
stayed undetected. Hence, the old VATSIM FSD HTTP URL was used.
This commit is contained in:
Lars Toenning
2023-10-04 15:40:35 +02:00
parent 77d7559477
commit d29705a01b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/share/shared/bootstrap/bootstrap.json
View File

@@ -71,5 +71,5 @@
} }
] ]
}, },
"wasLoadedFromFile": false, "wasLoadedFromFile": false
} }

9
src/blackmisc/json.cpp
View File

@@ -411,7 +411,14 @@ namespace BlackMisc::Json
QJsonObject jsonObjectFromString(const QString &json, bool acceptCacheFormat) QJsonObject jsonObjectFromString(const QString &json, bool acceptCacheFormat)
{ {
if (json.isEmpty()) { return QJsonObject(); } 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(); return acceptCacheFormat ? Json::unwrapCache(jsonDoc.object()) : jsonDoc.object();
} }