kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T38356: Crash when UIList.filter_items returns too few items.

Browse Source
This commit is contained in:
Bastien Montagne 2014-01-24 22:12:38 +01:00
parent 28564e1583
commit c0a4089265
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/interface/interface_templates.c
View File

@ -2806,14 +2806,8 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co
ui_list->layout_type = layout_type; ui_list->layout_type = layout_type;
/* Reset filtering data. */ /* Reset filtering data. */
if (dyn_data->items_filter_flags) { MEM_SAFE_FREE(dyn_data->items_filter_flags);
MEM_freeN(dyn_data->items_filter_flags); MEM_SAFE_FREE(dyn_data->items_filter_neworder);
dyn_data->items_filter_flags = NULL;
}
if (dyn_data->items_filter_neworder) {
MEM_freeN(dyn_data->items_filter_neworder);
dyn_data->items_filter_neworder = NULL;
}
dyn_data->items_len = dyn_data->items_shown = -1; dyn_data->items_len = dyn_data->items_shown = -1;
/* When active item changed since last draw, scroll to it. */ /* When active item changed since last draw, scroll to it. */

22
source/blender/makesrna/intern/rna_ui.c
View File

@ -358,30 +358,34 @@ static void uilist_filter_items(uiList *ui_list, bContext *C, PointerRNA *datapt
parm = RNA_function_find_parameter(NULL, func, "filter_flags"); parm = RNA_function_find_parameter(NULL, func, "filter_flags");
ret_len = RNA_parameter_dynamic_length_get(&list, parm); ret_len = RNA_parameter_dynamic_length_get(&list, parm);
if (ret_len != len && ret_len != 0) { if (ret_len != len && ret_len != 0) {
printf("%s: Error, py func returned %d items in %s, %d or none were expected.\n", AT, printf("%s: Error, py func returned %d items in %s, %d or none were expected.\n", __func__,
RNA_parameter_dynamic_length_get(&list, parm), "filter_flags", len); RNA_parameter_dynamic_length_get(&list, parm), "filter_flags", len);
RNA_parameter_list_free(&list); /* Note: we cannot return here, we would let flt_data in inconsistent state... see T38356. */
return; filter_flags = NULL;
} }
else {
RNA_parameter_get(&list, parm, &ret1); RNA_parameter_get(&list, parm, &ret1);
filter_flags = (int *)ret1; filter_flags = (int *)ret1;
}
parm = RNA_function_find_parameter(NULL, func, "filter_neworder"); parm = RNA_function_find_parameter(NULL, func, "filter_neworder");
ret_len = RNA_parameter_dynamic_length_get(&list, parm); ret_len = RNA_parameter_dynamic_length_get(&list, parm);
if (ret_len != len && ret_len != 0) { if (ret_len != len && ret_len != 0) {
printf("%s: Error, py func returned %d items in %s, %d or none were expected.\n", AT, printf("%s: Error, py func returned %d items in %s, %d or none were expected.\n", __func__,
RNA_parameter_dynamic_length_get(&list, parm), "filter_neworder", len); RNA_parameter_dynamic_length_get(&list, parm), "filter_neworder", len);
RNA_parameter_list_free(&list); /* Note: we cannot return here, we would let flt_data in inconsistent state... see T38356. */
return; filter_neworder = NULL;
} }
else {
RNA_parameter_get(&list, parm, &ret2); RNA_parameter_get(&list, parm, &ret2);
filter_neworder = (int *)ret2; filter_neworder = (int *)ret2;
}
/* We have to do some final checks and transforms... */ /* We have to do some final checks and transforms... */
{ {
int i, filter_exclude = ui_list->filter_flag & UILST_FLT_EXCLUDE; int i, filter_exclude = ui_list->filter_flag & UILST_FLT_EXCLUDE;
if (filter_flags) { if (filter_flags) {
flt_data->items_filter_flags = MEM_mallocN(sizeof(int) * len, AT); flt_data->items_filter_flags = MEM_mallocN(sizeof(int) * len, __func__);
memcpy(flt_data->items_filter_flags, filter_flags, sizeof(int) * len); memcpy(flt_data->items_filter_flags, filter_flags, sizeof(int) * len);
if (filter_neworder) { if (filter_neworder) {
@ -397,7 +401,7 @@ static void uilist_filter_items(uiList *ui_list, bContext *C, PointerRNA *datapt
} }
} }
items_shown = flt_data->items_shown = shown_idx; items_shown = flt_data->items_shown = shown_idx;
flt_data->items_filter_neworder = MEM_mallocN(sizeof(int) * items_shown, AT); flt_data->items_filter_neworder = MEM_mallocN(sizeof(int) * items_shown, __func__);
/* And now, bring back new indices into the [0, items_shown[ range! /* And now, bring back new indices into the [0, items_shown[ range!
* XXX This is O(N²)... :/ * XXX This is O(N²)... :/
*/ */
@ -429,7 +433,7 @@ static void uilist_filter_items(uiList *ui_list, bContext *C, PointerRNA *datapt
flt_data->items_shown = len; flt_data->items_shown = len;
if (filter_neworder) { if (filter_neworder) {
flt_data->items_filter_neworder = MEM_mallocN(sizeof(int) * len, AT); flt_data->items_filter_neworder = MEM_mallocN(sizeof(int) * len, __func__);
memcpy(flt_data->items_filter_neworder, filter_neworder, sizeof(int) * len); memcpy(flt_data->items_filter_neworder, filter_neworder, sizeof(int) * len);
} }
} }