griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix memory leak when copying materials from evaluated data.

Browse Source 
The materials array was being allocated even when `eval_totcol` is zero.
The material code assumes that the array is nullptr when totcol is zero
and would leak that memory. Only allocate the array when the material
count is greater than zero.
This commit is contained in:
Lukas Tönne
2024-05-27 14:27:42 +02:00
parent 388855132e
commit dbe39fb202
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/material.cc
View File

@@ -1234,7 +1234,7 @@ void BKE_object_material_from_eval_data(Main *bmain, Object *ob_orig, const ID *
/* Create new material slots based on materials on evaluated geometry. */
*orig_totcol = *eval_totcol;
*orig_mat = MEM_cnew_array<Material *>(*eval_totcol, __func__);
*orig_mat = *eval_totcol > 0 ? MEM_cnew_array<Material *>(*eval_totcol, __func__) : nullptr;
for (int i = 0; i < *eval_totcol; i++) {
Material *material_eval = (*eval_mat)[i];
if (material_eval != nullptr) {