Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 22:35:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #480 from kasenvr/fix/gltf-corrupt-crash

Browse source 
Prevent a crash for corrupted GLTF models.
This commit is contained in:
kasenvr 2020-07-04 17:20:24 -04:00 committed by GitHub
commit ed2894a9f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libraries/fbx/src/GLTFSerializer.cpp
View file

@ -1055,6 +1055,11 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash&
int indicesAccessorIdx = primitive.indices; int indicesAccessorIdx = primitive.indices;
if (indicesAccessorIdx > _file.accessors.size()) {
qWarning(modelformat) << "Indices accessor index is out of bounds for model " << _url;
continue;
}
GLTFAccessor& indicesAccessor = _file.accessors[indicesAccessorIdx]; GLTFAccessor& indicesAccessor = _file.accessors[indicesAccessorIdx];
// Buffers // Buffers
@ -1093,6 +1098,11 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash&
foreach(auto &key, keys) { foreach(auto &key, keys) {
int accessorIdx = primitive.attributes.values[key]; int accessorIdx = primitive.attributes.values[key];
if (accessorIdx > _file.accessors.size()) {
qWarning(modelformat) << "Accessor index is out of bounds for model " << _url;
continue;
}
GLTFAccessor& accessor = _file.accessors[accessorIdx]; GLTFAccessor& accessor = _file.accessors[accessorIdx];
if (key == "POSITION") { if (key == "POSITION") {
@ -1239,6 +1249,11 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash&
int v2_index = (indices[n + 1] * 3); int v2_index = (indices[n + 1] * 3);
int v3_index = (indices[n + 2] * 3); int v3_index = (indices[n + 2] * 3);
if (v1_index + 2 >= vertices.size() || v2_index + 2 >= vertices.size() || v3_index + 2 >= vertices.size()) {
qWarning(modelformat) << "Indices out of range for model " << _url;
break;
}
glm::vec3 v1 = glm::vec3(vertices[v1_index], vertices[v1_index + 1], vertices[v1_index + 2]); glm::vec3 v1 = glm::vec3(vertices[v1_index], vertices[v1_index + 1], vertices[v1_index + 2]);
glm::vec3 v2 = glm::vec3(vertices[v2_index], vertices[v2_index + 1], vertices[v2_index + 2]); glm::vec3 v2 = glm::vec3(vertices[v2_index], vertices[v2_index + 1], vertices[v2_index + 2]);
glm::vec3 v3 = glm::vec3(vertices[v3_index], vertices[v3_index + 1], vertices[v3_index + 2]); glm::vec3 v3 = glm::vec3(vertices[v3_index], vertices[v3_index + 1], vertices[v3_index + 2]);
@ -1333,7 +1348,7 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash&
} }
if (validatedIndices.size() == 0) { if (validatedIndices.size() == 0) {
qWarning(modelformat) << "Indices out of range for model " << _url; qWarning(modelformat) << "No valid indices for model " << _url;
continue; continue;
} }