Commit: f9a5dab529d8177c7d0266b9cedbec6e1ac4850a
Author: Campbell Barton
Date: Fri Feb 20 17:16:58 2015 +1100
Branches: master
https://developer.blender.org/rBf9a5dab529d8177c7d0266b9cedbec6e1ac4850a
RNA: calloc -> malloc when fixbuf is uninitialized
===================================================================
M source/blender/makesrna/intern/rna_access.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_access.c
b/source/blender/makesrna/intern/rna_access.c
index 10b5112..c3499d0 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -1923,7 +1923,7 @@ int RNA_property_boolean_get_index(PointerRNA *ptr,
PropertyRNA *prop, int index
else {
int *tmparray;
- tmparray = MEM_callocN(sizeof(int) * len, __func__);
+ tmparray = MEM_mallocN(sizeof(int) * len, __func__);
RNA_property_boolean_get_array(ptr, prop, tmparray);
value = tmparray[index];
MEM_freeN(tmparray);
@@ -1991,7 +1991,7 @@ void RNA_property_boolean_set_index(PointerRNA *ptr,
PropertyRNA *prop, int inde
else {
int *tmparray;
- tmparray = MEM_callocN(sizeof(int) * len, __func__);
+ tmparray = MEM_mallocN(sizeof(int) * len, __func__);
RNA_property_boolean_get_array(ptr, prop, tmparray);
tmparray[index] = value;
RNA_property_boolean_set_array(ptr, prop, tmparray);
@@ -2042,7 +2042,7 @@ int RNA_property_boolean_get_default_index(PointerRNA
*ptr, PropertyRNA *prop, i
else {
int *tmparray, value;
- tmparray = MEM_callocN(sizeof(int) * len, __func__);
+ tmparray = MEM_mallocN(sizeof(int) * len, __func__);
RNA_property_boolean_get_default_array(ptr, prop, tmparray);
value = tmparray[index];
MEM_freeN(tmparray);
@@ -2182,7 +2182,7 @@ int RNA_property_int_get_index(PointerRNA *ptr,
PropertyRNA *prop, int index)
else {
int *tmparray, value;
- tmparray = MEM_callocN(sizeof(int) * len, __func__);
+ tmparray = MEM_mallocN(sizeof(int) * len, __func__);
RNA_property_int_get_array(ptr, prop, tmparray);
value = tmparray[index];
MEM_freeN(tmparray);
@@ -2250,7 +2250,7 @@ void RNA_property_int_set_index(PointerRNA *ptr,
PropertyRNA *prop, int index, i
else {
int *tmparray;
- tmparray = MEM_callocN(sizeof(int) * len, __func__);
+ tmparray = MEM_mallocN(sizeof(int) * len, __func__);
RNA_property_int_get_array(ptr, prop, tmparray);
tmparray[index] = value;
RNA_property_int_set_array(ptr, prop, tmparray);
@@ -2296,7 +2296,7 @@ int RNA_property_int_get_default_index(PointerRNA *ptr,
PropertyRNA *prop, int i
else {
int *tmparray, value;
- tmparray = MEM_callocN(sizeof(int) * len, __func__);
+ tmparray = MEM_mallocN(sizeof(int) * len, __func__);
RNA_property_int_get_default_array(ptr, prop, tmparray);
value = tmparray[index];
MEM_freeN(tmparray);
@@ -2452,7 +2452,7 @@ float RNA_property_float_get_index(PointerRNA *ptr,
PropertyRNA *prop, int index
else {
float *tmparray, value;
- tmparray = MEM_callocN(sizeof(float) * len, __func__);
+ tmparray = MEM_mallocN(sizeof(float) * len, __func__);
RNA_property_float_get_array(ptr, prop, tmparray);
value = tmparray[index];
MEM_freeN(tmparray);
@@ -2532,7 +2532,7 @@ void RNA_property_float_set_index(PointerRNA *ptr,
PropertyRNA *prop, int index,
else {
float *tmparray;
- tmparray = MEM_callocN(sizeof(float) * len, __func__);
+ tmparray = MEM_mallocN(sizeof(float) * len, __func__);
RNA_property_float_get_array(ptr, prop, tmparray);
tmparray[index] = value;
RNA_property_float_set_array(ptr, prop, tmparray);
@@ -2582,7 +2582,7 @@ float RNA_property_float_get_default_index(PointerRNA
*ptr, PropertyRNA *prop, i
else {
float *tmparray, value;
- tmparray = MEM_callocN(sizeof(float) * len, __func__);
+ tmparray = MEM_mallocN(sizeof(float) * len, __func__);
RNA_property_float_get_default_array(ptr, prop, tmparray);
value = tmparray[index];
MEM_freeN(tmparray);
@@ -3910,7 +3910,7 @@ static char *rna_path_token(const char **path, char
*fixedbuf, int fixedlen, int
if (len + 1 < fixedlen)
buf = fixedbuf;
else
- buf = MEM_callocN(sizeof(char) * (len + 1), "rna_path_token");
+ buf = MEM_mallocN(sizeof(char) * (len + 1), "rna_path_token");
/* copy string, taking into account escaped ] */
if (bracket) {
@@ -6651,8 +6651,8 @@ bool RNA_property_equals(PointerRNA *a, PointerRNA *b,
PropertyRNA *prop, eRNAEq
int *array_a, *array_b;
bool equals;
- array_a = (len > 16) ? MEM_callocN(sizeof(int)
* len, "RNA equals") : fixed_a;
- array_b = (len > 16) ? MEM_callocN(sizeof(int)
* len, "RNA equals") : fixed_b;
+ array_a = (len > 16) ? MEM_mallocN(sizeof(int)
* len, "RNA equals") : fixed_a;
+ array_b = (len > 16) ? MEM_mallocN(sizeof(int)
* len, "RNA equals") : fixed_b;
RNA_property_boolean_get_array(a, prop,
array_a);
RNA_property_boolean_get_array(b, prop,
array_b);
@@ -6677,8 +6677,8 @@ bool RNA_property_equals(PointerRNA *a, PointerRNA *b,
PropertyRNA *prop, eRNAEq
int *array_a, *array_b;
bool equals;
- array_a = (len > 16) ? MEM_callocN(sizeof(int)
* len, "RNA equals") : fixed_a;
- array_b = (len > 16) ? MEM_callocN(sizeof(int)
* len, "RNA equals") : fixed_b;
+ array_a = (len > 16) ? MEM_mallocN(sizeof(int)
* len, "RNA equals") : fixed_a;
+ array_b = (len > 16) ? MEM_mallocN(sizeof(int)
* len, "RNA equals") : fixed_b;
RNA_property_int_get_array(a, prop, array_a);
RNA_property_int_get_array(b, prop, array_b);
@@ -6703,8 +6703,8 @@ bool RNA_property_equals(PointerRNA *a, PointerRNA *b,
PropertyRNA *prop, eRNAEq
float *array_a, *array_b;
bool equals;
- array_a = (len > 16) ?
MEM_callocN(sizeof(float) * len, "RNA equals") : fixed_a;
- array_b = (len > 16) ?
MEM_callocN(sizeof(float) * len, "RNA equals") : fixed_b;
+ array_a = (len > 16) ?
MEM_mallocN(sizeof(float) * len, "RNA equals") : fixed_a;
+ array_b = (len > 16) ?
MEM_mallocN(sizeof(float) * len, "RNA equals") : fixed_b;
RNA_property_float_get_array(a, prop, array_a);
RNA_property_float_get_array(b, prop, array_b);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
