[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58746] trunk/blender/source/blender/ blenkernel/intern/key.c: Use malloc in cases when data is getting overwriten after allocation.

[Sergey Sharybin]

Revision: 58746
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58746
Author:   nazgul
Date:     2013-07-30 18:49:40 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
Use malloc in cases when data is getting overwriten after allocation.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/key.c

Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c	2013-07-30 18:43:25 UTC (rev 58745)
+++ trunk/blender/source/blender/blenkernel/intern/key.c	2013-07-30 18:49:40 UTC (rev 58746)
@@ -533,7 +533,7 @@
 
 			if (me->edit_btmesh && me->edit_btmesh->bm->totvert == kb->totelem) {
 				a = 0;
-				co = MEM_callocN(sizeof(float) * 3 * me->edit_btmesh->bm->totvert, "key_block_get_data");
+				co = MEM_mallocN(sizeof(float) * 3 * me->edit_btmesh->bm->totvert, "key_block_get_data");
 
 				BM_ITER_MESH (eve, &iter, me->edit_btmesh->bm, BM_VERTS_OF_MESH) {
 					copy_v3_v3(co[a], eve->co);
@@ -1091,7 +1091,7 @@
 		float *weights;
 		int i;
 		
-		weights = MEM_callocN(totvert * sizeof(float), "weights");
+		weights = MEM_mallocN(totvert * sizeof(float), "weights");
 
 		if (em) {
 			const int cd_dvert_offset = CustomData_get_offset(&em->bm->vdata, CD_MDEFORMVERT);
@@ -1622,7 +1622,7 @@
 
 	if (kb->data) MEM_freeN(kb->data);
 
-	kb->data = MEM_callocN(lt->key->elemsize * tot, "kb->data");
+	kb->data = MEM_mallocN(lt->key->elemsize * tot, "kb->data");
 	kb->totelem = tot;
 
 	bp = lt->def;
@@ -1664,7 +1664,7 @@
 
 	if (kb->data) MEM_freeN(kb->data);
 
-	kb->data = MEM_callocN(cu->key->elemsize * tot, "kb->data");
+	kb->data = MEM_mallocN(cu->key->elemsize * tot, "kb->data");
 	kb->totelem = tot;
 
 	nu = nurb->first;
@@ -1762,7 +1762,7 @@
 
 	if (kb->data) MEM_freeN(kb->data);
 
-	kb->data = MEM_callocN(me->key->elemsize * me->totvert, "kb->data");
+	kb->data = MEM_mallocN(me->key->elemsize * me->totvert, "kb->data");
 	kb->totelem = me->totvert;
 
 	mvert = me->mvert;
@@ -1812,7 +1812,7 @@
 
 	if (tot == 0) return NULL;
 
-	vertCos = MEM_callocN(tot * sizeof(*vertCos), "BKE_key_convert_to_vertcos vertCos");
+	vertCos = MEM_mallocN(tot * sizeof(*vertCos), "BKE_key_convert_to_vertcos vertCos");
 
 	/* Copy coords to array */
 	co = (float *)vertCos;
@@ -1895,7 +1895,7 @@
 		return;
 	}
 
-	fp = kb->data = MEM_callocN(tot * elemsize, "BKE_key_convert_to_vertcos vertCos");
+	fp = kb->data = MEM_mallocN(tot * elemsize, "BKE_key_convert_to_vertcos vertCos");
 
 	/* Copy coords to keyblock */