[Bf-blender-cvs] [c324adf] compositor-2016: BMesh: don't alloc zero sized select elem array

Campbell Barton noreply at git.blender.org
Wed Jun 8 21:50:13 CEST 2016


Commit: c324adf4e2cda9aa916fc199e396e990ab43c595
Author: Campbell Barton
Date:   Thu May 26 15:55:09 2016 +1000
Branches: compositor-2016
https://developer.blender.org/rBc324adf4e2cda9aa916fc199e396e990ab43c595

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) {




More information about the Bf-blender-cvs mailing list