diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-24 13:23:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-24 13:23:13 +0100 |
| commit | f3864ec89f337ad1454a7112ba47896f2524ba9b (patch) | |
| tree | b83e3e1198a7031ed7017c6607db07d790c33a60 /scene/resources/mesh_data_tool.cpp | |
| parent | 049d654c49b3b385998a23af0317d22511833c95 (diff) | |
| parent | 8e82cf8174873342b3455f4ed541d3450fea3e24 (diff) | |
Merge pull request #46357 from kleonc/mesh_data_tool_crash_fix
MeshDataTool::create_from_surface Fail on invalid index data
Diffstat (limited to 'scene/resources/mesh_data_tool.cpp')
| -rw-r--r-- | scene/resources/mesh_data_tool.cpp | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/scene/resources/mesh_data_tool.cpp b/scene/resources/mesh_data_tool.cpp index 1b82aca386..3fb4f8f211 100644 --- a/scene/resources/mesh_data_tool.cpp +++ b/scene/resources/mesh_data_tool.cpp @@ -50,6 +50,28 @@ Error MeshDataTool::create_from_surface(const Ref<ArrayMesh> &p_mesh, int p_surf int vcount = varray.size(); ERR_FAIL_COND_V(vcount == 0, ERR_INVALID_PARAMETER); + Vector<int> indices; + + if (arrays[Mesh::ARRAY_INDEX].get_type() != Variant::NIL) { + indices = arrays[Mesh::ARRAY_INDEX]; + } else { + //make code simpler + indices.resize(vcount); + int *iw = indices.ptrw(); + for (int i = 0; i < vcount; i++) { + iw[i] = i; + } + } + + int icount = indices.size(); + const int *r = indices.ptr(); + + ERR_FAIL_COND_V(icount == 0, ERR_INVALID_PARAMETER); + ERR_FAIL_COND_V(icount % 3, ERR_INVALID_PARAMETER); + for (int i = 0; i < icount; i++) { + ERR_FAIL_INDEX_V(r[i], vcount, ERR_INVALID_PARAMETER); + } + clear(); format = p_mesh->surface_get_format(p_surface); material = p_mesh->surface_get_material(p_surface); @@ -128,22 +150,6 @@ Error MeshDataTool::create_from_surface(const Ref<ArrayMesh> &p_mesh, int p_surf vertices.write[i] = v; } - Vector<int> indices; - - if (arrays[Mesh::ARRAY_INDEX].get_type() != Variant::NIL) { - indices = arrays[Mesh::ARRAY_INDEX]; - } else { - //make code simpler - indices.resize(vcount); - int *iw = indices.ptrw(); - for (int i = 0; i < vcount; i++) { - iw[i] = i; - } - } - - int icount = indices.size(); - const int *r = indices.ptr(); - Map<Point2i, int> edge_indices; for (int i = 0; i < icount; i += 3) { |