Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 23:01:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14422 from SimonWalton-HiFi/entities-json-less-strict

Browse source 
Don't check for presence of particular keys in models json
This commit is contained in:
Jeff Clinton 2018-11-19 10:29:10 -08:00 committed by GitHub
commit 484de06cf4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libraries/octree/src/OctreeEntitiesFileParser.cpp
View file

@ -46,8 +46,13 @@ bool OctreeEntitiesFileParser::parseEntities(QVariantMap& parsedEntities) {
bool gotId = false; bool gotId = false;
bool gotVersion = false; bool gotVersion = false;
while (!(gotDataVersion && gotEntities && gotId && gotVersion)) { int token = nextToken();
if (nextToken() != '"') {
while (true) {
if (token == '}') {
break;
}
else if (token != '"') {
_errorString = "Incorrect key string"; _errorString = "Incorrect key string";
return false; return false;
} }
@ -144,15 +149,13 @@ bool OctreeEntitiesFileParser::parseEntities(QVariantMap& parsedEntities) {
return false; return false;
} }
if (gotDataVersion && gotEntities && gotId && gotVersion) { token = nextToken();
break; if (token == ',') {
} else if (nextToken() != ',') { token = nextToken();
_errorString = "Id/value incorrectly terminated";
return false;
} }
} }
if (nextToken() != '}' || nextToken() != -1) { if (nextToken() != -1) {
_errorString = "Ill-formed end of object"; _errorString = "Ill-formed end of object";
return false; return false;
} }