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

Detect failed conversion from QVariant to JSON better

Browse source
This commit is contained in:
Simon Walton 2018-10-10 17:11:42 -07:00
parent 91df342ae9
commit c938c595c0
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/octree/src/Octree.cpp
View file

@ -878,14 +878,24 @@ bool Octree::toJSONDocument(QJsonDocument* doc, const OctreeElementPointer& elem
return false;
}
*doc = QJsonDocument::fromVariant(entityDescription);
bool noEntities = entityDescription["Entities"].toList().empty();
QJsonDocument jsonDocTree = QJsonDocument::fromVariant(entityDescription);
QJsonValue entitiesJson = jsonDocTree["Entities"];
if (entitiesJson.isNull() || (entitiesJson.toArray().empty() && !noEntities)) {
// Json version of entities too large.
return false;
} else {
*doc = jsonDocTree;
}
return true;
}
bool Octree::toJSON(QByteArray* data, const OctreeElementPointer& element, bool doGzip) {
QJsonDocument doc;
if (!toJSONDocument(&doc, element)) {
qCritical("Failed to convert Entities to QVariantMap while converting to json.");
qCritical("Failed to convert Entities to JSON document.");
return false;
}