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

CustomData: assert on bad arguments to free

Browse Source 
Assert the index is in-range for the layer type.
This commit is contained in:
Campbell Barton
2017-05-27 14:03:15 +10:00
parent 19809c8385
commit 2eead82ce0
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenkernel/intern/customdata.c
View File

@@ -1944,17 +1944,16 @@ void *CustomData_add_layer_named(CustomData *data, int type, int alloctype,
bool CustomData_free_layer(CustomData *data, int type, int totelem, int index)
{
if (index < 0) {
return false;
}
const int index_first = CustomData_get_layer_index(data, type);
if (index_first == -1) {
return false;
}
const int n = index - index_first;
int i;
BLI_assert(index >= index_first);
if ((index_first == -1) || (n < 0)) {
return false;
}
BLI_assert(data->layers[index].type == type);
customData_free_layer__internal(&data->layers[index], totelem);
for (i = index + 1; i < data->totlayer; ++i)