godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MeshDataTool memory corruption fix 

Fix for incorrect types used in MeshDataTool for bones and weights.

If your mesh contains these memory accesses get OOB and might crash
the application

Closes #21713
This commit is contained in:
Sergey Lapin 2018-09-05 23:29:25 +03:00
parent 9768ce5763
commit e50d56b4c6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/resources/mesh_data_tool.cpp
View File

@ -79,9 +79,9 @@ Error MeshDataTool::create_from_surface(const Ref<ArrayMesh> &p_mesh, int p_surf
if (arrays[Mesh::ARRAY_COLOR].get_type() != Variant::NIL) if (arrays[Mesh::ARRAY_COLOR].get_type() != Variant::NIL)
col = arrays[Mesh::ARRAY_COLOR].operator PoolVector<Color>().read(); col = arrays[Mesh::ARRAY_COLOR].operator PoolVector<Color>().read();
PoolVector<real_t>::Read bo; PoolVector<int>::Read bo;
if (arrays[Mesh::ARRAY_BONES].get_type() != Variant::NIL) if (arrays[Mesh::ARRAY_BONES].get_type() != Variant::NIL)
bo = arrays[Mesh::ARRAY_BONES].operator PoolVector<real_t>().read(); bo = arrays[Mesh::ARRAY_BONES].operator PoolVector<int>().read();
PoolVector<real_t>::Read we; PoolVector<real_t>::Read we;
if (arrays[Mesh::ARRAY_WEIGHTS].get_type() != Variant::NIL) if (arrays[Mesh::ARRAY_WEIGHTS].get_type() != Variant::NIL)
@ -194,7 +194,7 @@ Error MeshDataTool::commit_to_surface(const Ref<ArrayMesh> &p_mesh) {
PoolVector<Vector2> u; PoolVector<Vector2> u;
PoolVector<Vector2> u2; PoolVector<Vector2> u2;
PoolVector<Color> c; PoolVector<Color> c;
PoolVector<real_t> b; PoolVector<int> b;
PoolVector<real_t> w; PoolVector<real_t> w;
PoolVector<int> in; PoolVector<int> in;
@ -233,7 +233,7 @@ Error MeshDataTool::commit_to_surface(const Ref<ArrayMesh> &p_mesh) {
col = c.write(); col = c.write();
} }
PoolVector<real_t>::Write bo; PoolVector<int>::Write bo;
if (format & Mesh::ARRAY_FORMAT_BONES) { if (format & Mesh::ARRAY_FORMAT_BONES) {
b.resize(vcount * 4); b.resize(vcount * 4);
bo = b.write(); bo = b.write();