[Bf-blender-cvs] [fe766d9] master: BMesh: don't alloc zero sized select elem array

[Campbell Barton]

Commit: fe766d9c7a678b7f836943ce989cbf5d0503c75c
Author: Campbell Barton
Date:   Thu May 26 15:55:09 2016 +1000
Branches: master
https://developer.blender.org/rBfe766d9c7a678b7f836943ce989cbf5d0503c75c

BMesh: don't alloc zero sized select elem array

===================================================================

M	source/blender/bmesh/intern/bmesh_mesh_conv.c

===================================================================

diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c
index 7b102c9..bb61f66 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) {