Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 13:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

drop invalid mappings on AssetServer load

Browse source
This commit is contained in:
Stephen Birarda 2016-03-09 17:30:02 -08:00
parent ea5349f7a0
commit 7b08ae3747
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
assignment-client/src/assets/AssetServer.cpp
View file

@ -453,6 +453,30 @@ void AssetServer::loadMappingsFromFile() {
if (error.error == QJsonParseError::NoError) {
_fileMappings = jsonDocument.object().toVariantHash();
// remove any mappings that don't match the expected format
auto it = _fileMappings.begin();
while (it != _fileMappings.end()) {
bool shouldDrop = false;
if (it.key()[0] != '/') {
qWarning() << "Will not keep mapping for" << it.key() << "since it does not have a leading forward slash.";
shouldDrop = true;
}
QRegExp hashFileRegex { "^[A-Fa-f0-9]{" + QString::number(SHA256_HASH_HEX_LENGTH) + "}$" };
if (!hashFileRegex.exactMatch(it.value().toString())) {
qWarning() << "Will not keep mapping for" << it.key() << "since it does not have a valid hash.";
shouldDrop = true;
}
if (shouldDrop) {
it = _fileMappings.erase(it);
} else {
++it;
}
}
qInfo() << "Loaded" << _fileMappings.count() << "mappings from map file at" << mapFilePath;
return;
}