[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58207] trunk/blender/source/blender: fix bad uses of sizeof() with memory allocation.
Campbell Barton
ideasman42 at gmail.com
Sat Jul 13 07:43:36 CEST 2013
Revision: 58207
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58207
Author: campbellbarton
Date: 2013-07-13 05:43:35 +0000 (Sat, 13 Jul 2013)
Log Message:
-----------
fix bad uses of sizeof() with memory allocation.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c 2013-07-12 21:36:45 UTC (rev 58206)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c 2013-07-13 05:43:35 UTC (rev 58207)
@@ -530,7 +530,7 @@
if (1) {
/* now convert linknodes into arrays for faster per pixel access */
- unsigned int **buckets_face = MEM_mallocN(bucket_tot * sizeof(unsigned int **), __func__);
+ unsigned int **buckets_face = MEM_mallocN(bucket_tot * sizeof(*buckets_face), __func__);
unsigned int bucket_index;
for (bucket_index = 0; bucket_index < bucket_tot; bucket_index++) {
Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c 2013-07-12 21:36:45 UTC (rev 58206)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c 2013-07-13 05:43:35 UTC (rev 58207)
@@ -440,7 +440,7 @@
MovieClipImBufCacheKey *key = (MovieClipImBufCacheKey *) key_v;
MovieClipCachePriorityData *priority_data;
- priority_data = MEM_callocN(sizeof(priority_data), "movie cache clip priority data");
+ priority_data = MEM_callocN(sizeof(*priority_data), "movie cache clip priority data");
priority_data->framenr = key->framenr;
return priority_data;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_solidify.c 2013-07-12 21:36:45 UTC (rev 58206)
+++ trunk/blender/source/blender/modifiers/intern/MOD_solidify.c 2013-07-13 05:43:35 UTC (rev 58207)
@@ -242,7 +242,7 @@
unsigned int *new_edge_arr = NULL;
STACK_DECLARE(new_edge_arr);
- unsigned int *old_vert_arr = MEM_callocN(sizeof(old_vert_arr) * (size_t)numVerts, "old_vert_arr in solidify");
+ unsigned int *old_vert_arr = MEM_callocN(sizeof(*old_vert_arr) * (size_t)numVerts, "old_vert_arr in solidify");
unsigned int *edge_users = NULL;
char *edge_order = NULL;
More information about the Bf-blender-cvs
mailing list