v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Heap corruption in BlenderImporter::ConvertMesh function. closes #36

pull/40/head
acgessler 2013-05-03 23:16:56 +02:00
parent 24daead8cb
commit b8ed6fbcef
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/BlenderLoader.cpp
View File

@ -644,14 +644,18 @@ void BlenderImporter::ConvertMesh(const Scene& /*in*/, const Object* /*obj*/, co
// collect per-submesh numbers // collect per-submesh numbers
std::map<int,size_t> per_mat; std::map<int,size_t> per_mat;
std::map<int,size_t> per_mat_verts;
for (int i = 0; i < mesh->totface; ++i) { for (int i = 0; i < mesh->totface; ++i) {
const MFace& mf = mesh->mface[i]; const MFace& mf = mesh->mface[i];
per_mat[ mf.mat_nr ]++; per_mat[ mf.mat_nr ]++;
per_mat_verts[ mf.mat_nr ] += mf.v4?4:3;
} }
for (int i = 0; i < mesh->totpoly; ++i) { for (int i = 0; i < mesh->totpoly; ++i) {
const MPoly& mp = mesh->mpoly[i]; const MPoly& mp = mesh->mpoly[i];
per_mat[ mp.mat_nr ]++; per_mat[ mp.mat_nr ]++;
per_mat_verts[ mp.mat_nr ] += mp.totloop;
} }
// ... and allocate the corresponding meshes // ... and allocate the corresponding meshes
@ -665,8 +669,8 @@ void BlenderImporter::ConvertMesh(const Scene& /*in*/, const Object* /*obj*/, co
temp->push_back(new aiMesh()); temp->push_back(new aiMesh());
aiMesh* out = temp->back(); aiMesh* out = temp->back();
out->mVertices = new aiVector3D[it.second*4]; out->mVertices = new aiVector3D[per_mat_verts[it.first]];
out->mNormals = new aiVector3D[it.second*4]; out->mNormals = new aiVector3D[per_mat_verts[it.first]];
//out->mNumFaces = 0 //out->mNumFaces = 0
//out->mNumVertices = 0 //out->mNumVertices = 0