griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Forgotten in last commit: Check the allocation

Browse Source
This commit is contained in:
Germano Cavalcante
2017-02-16 23:41:38 -03:00
parent 6c59a3b37a
commit d41451a0ca
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenkernel/intern/bvhutils.c
View File

@@ -587,7 +587,9 @@ BVHTree *bvhtree_from_mesh_verts(
data, tree, true, epsilon, vert, vert_allocated);
}
else {
MEM_freeN(vert);
if (vert_allocated) {
MEM_freeN(vert);
}
memset(data, 0, sizeof(*data));
}
return tree;
@@ -792,8 +794,12 @@ BVHTree *bvhtree_from_mesh_edges(
data, tree, true, epsilon, vert, vert_allocated, edge, edge_allocated);
}
else {
MEM_freeN(vert);
MEM_freeN(edge);
if (vert_allocated) {
MEM_freeN(vert);
}
if (edge_allocated) {
MEM_freeN(edge);
}
memset(data, 0, sizeof(*data));
}
return tree;
@@ -943,8 +949,12 @@ BVHTree *bvhtree_from_mesh_faces(
data, tree, true, epsilon, vert, vert_allocated, face, face_allocated);
}
else {
MEM_freeN(vert);
MEM_freeN(face);
if (vert_allocated) {
MEM_freeN(vert);
}
if (face_allocated) {
MEM_freeN(face);
}
memset(data, 0, sizeof(*data));
}
return tree;