diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index 4b8512a5560..4a7e5015d31 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -1309,7 +1309,7 @@ bool BLI_dir_create_recursive(const char *dirname) tmp = static_buf; # else size = strlen(dirname) + 1; - tmp = MEM_callocN(size, __func__); + tmp = MEM_mallocN(size, __func__); # endif BLI_strncpy(tmp, dirname, size); diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c index a53e06aedd7..33777bbc33d 100644 --- a/source/blender/makesrna/intern/makesrna.c +++ b/source/blender/makesrna/intern/makesrna.c @@ -1151,11 +1151,6 @@ static char *rna_def_property_set_func( } else { const PropertySubType subtype = prop->subtype; - const char *string_copy_func = - ELEM(subtype, PROP_FILEPATH, PROP_DIRPATH, PROP_FILENAME, PROP_BYTESTRING) ? - "BLI_strncpy" : - "BLI_strncpy_utf8"; - rna_print_data_get(f, dp); if (dp->dnapointerlevel == 1) { @@ -1165,10 +1160,14 @@ static char *rna_def_property_set_func( fprintf(f, " const int length = strlen(value);\n"); fprintf(f, " if (length > 0) {\n"); fprintf(f, " data->%s = MEM_mallocN(length + 1, __func__);\n", dp->dnaname); - fprintf(f, " %s(data->%s, value, length + 1);\n", string_copy_func, dp->dnaname); + fprintf(f, " memcpy(data->%s, value, length + 1);\n", dp->dnaname); fprintf(f, " } else { data->%s = NULL; }\n", dp->dnaname); } else { + const char *string_copy_func = + ELEM(subtype, PROP_FILEPATH, PROP_DIRPATH, PROP_FILENAME, PROP_BYTESTRING) ? + "BLI_strncpy" : + "BLI_strncpy_utf8"; /* Handle char array properties. */ if (sprop->maxlength) { fprintf(f,