blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix NULL check before free

This commit is contained in:
Campbell Barton 2016-04-01 05:42:15 +11:00
parent 9431fc6764
commit 553ea6de8b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/mesh/editmesh_knife.c
View File

@ -2276,12 +2276,8 @@ static void knife_make_face_cuts(KnifeTool_OpData *kcd, BMFace *f, ListBase *kfe
KnifeEdge *kfe;
Ref *ref;
int edge_array_len = BLI_listbase_count(kfedges);
bool ok;
int i;
BMFace **face_arr;
int face_arr_len;
BMEdge **edge_array = BLI_array_alloca(edge_array, edge_array_len);
/* point to knife edges we've created edges in, edge_array aligned */
@ -2357,12 +2353,17 @@ static void knife_make_face_cuts(KnifeTool_OpData *kcd, BMFace *f, ListBase *kfe
}
#endif
ok = BM_face_split_edgenet(
bm, f, edge_array, edge_array_len,
&face_arr, &face_arr_len);
{
BMFace **face_arr = NULL;
int face_arr_len;
if (ok) {
MEM_freeN(face_arr);
BM_face_split_edgenet(
bm, f, edge_array, edge_array_len,
&face_arr, &face_arr_len);
if (face_arr) {
MEM_freeN(face_arr);
}
}
/* remove dangling edges, not essential - but nice for users */