From c0a40892652e89601060a9590ea0a6f0606d28bb Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 24 Jan 2014 22:12:38 +0100 Subject: Fix T38356: Crash when UIList.filter_items returns too few items. --- source/blender/editors/interface/interface_templates.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'source/blender/editors/interface') diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index fe3fb726115..14ec4d5e0f0 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2806,14 +2806,8 @@ void uiTemplateList(uiLayout *layout, bContext *C, const char *listtype_name, co ui_list->layout_type = layout_type; /* Reset filtering data. */ - if (dyn_data->items_filter_flags) { - MEM_freeN(dyn_data->items_filter_flags); - 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; - } + MEM_SAFE_FREE(dyn_data->items_filter_flags); + MEM_SAFE_FREE(dyn_data->items_filter_neworder); dyn_data->items_len = dyn_data->items_shown = -1; /* When active item changed since last draw, scroll to it. */ -- cgit v1.2.3