[Bf-blender-cvs] [50c977b] master: CustomData: replace calloc -> malloc

Campbell Barton noreply at git.blender.org
Mon Feb 23 04:00:50 CET 2015


Commit: 50c977b54d543cca93fb747a99b15682b5d15dfb
Author: Campbell Barton
Date:   Mon Feb 23 13:55:33 2015 +1100
Branches: master
https://developer.blender.org/rB50c977b54d543cca93fb747a99b15682b5d15dfb

CustomData: replace calloc -> malloc

stack array is uninitialized, relying on calloc here would just hide bugs.

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

M	source/blender/blenkernel/intern/customdata.c

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

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 94dc84e..585ae90 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -2232,7 +2232,7 @@ void CustomData_interp(const CustomData *source, CustomData *dest,
 	 * elements
 	 */
 	if (count > SOURCE_BUF_SIZE)
-		sources = MEM_callocN(sizeof(*sources) * count, __func__);
+		sources = MEM_mallocN(sizeof(*sources) * count, __func__);
 
 	/* interpolates a layer at a time */
 	dest_i = 0;
@@ -3013,7 +3013,7 @@ void CustomData_bmesh_interp(
 	 * elements
 	 */
 	if (count > SOURCE_BUF_SIZE)
-		sources = MEM_callocN(sizeof(*sources) * count, __func__);
+		sources = MEM_mallocN(sizeof(*sources) * count, __func__);
 
 	/* interpolates a layer at a time */
 	for (i = 0; i < data->totlayer; ++i) {




More information about the Bf-blender-cvs mailing list