Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r--source/blender/editors/interface/interface_regions.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 4a0584bca7b..22d91a7a747 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1091,9 +1091,17 @@ void ui_searchbox_free(bContext *C, ARegion *ar)
/* XXX weak: search_func adds all partial matches... */
void ui_but_search_test(uiBut *but)
{
- uiSearchItems *items= MEM_callocN(sizeof(uiSearchItems), "search items");
+ uiSearchItems *items;
int x1;
-
+
+ /* possibly very large lists (such as ID datablocks) only
+ * only validate string RNA buts (not pointers) */
+ if(but->rnaprop && RNA_property_type(but->rnaprop) != PROP_STRING) {
+ return;
+ }
+
+ items= MEM_callocN(sizeof(uiSearchItems), "search items");
+
/* setup search struct */
items->maxitem= 10;
items->maxstrlen= 256;