diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-05-26 08:55:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-05-26 08:56:12 +0300 |
| commit | fe766d9c7a678b7f836943ce989cbf5d0503c75c (patch) | |
| tree | e3c44b630e166844b0136a21168e2efb7d49a291 /source/blender/bmesh/intern/bmesh_mesh_conv.c | |
| parent | f2ba13964d01d8208d2dcf4e45d23661797fbfc0 (diff) | |
BMesh: don't alloc zero sized select elem array
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_mesh_conv.c')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index 7b102c9283b..bb61f66e267 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -804,10 +804,10 @@ void BM_mesh_bm_to_me( BMEditSelection *selected; me->totselect = BLI_listbase_count(&(bm->selected)); - if (me->mselect) MEM_freeN(me->mselect); - - me->mselect = MEM_callocN(sizeof(MSelect) * me->totselect, "Mesh selection history"); - + MEM_SAFE_FREE(me->mselect); + if (me->totselect != 0) { + me->mselect = MEM_mallocN(sizeof(MSelect) * me->totselect, "Mesh selection history"); + } for (i = 0, selected = bm->selected.first; selected; i++, selected = selected->next) { if (selected->htype == BM_VERT) { |