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

Fix more potential crashes when refreshing certain popups

Browse Source 
These popups had refreshing enabled, but the callback used for
refreshing would access a likely dangling operator pointer. One case can
use the operator-type pointer instead, in the other case disable
refreshing altogether. Also see 8ea79dc3a7.
This commit is contained in:
Julian Eisel
2024-05-27 21:21:39 +02:00
parent 8ea79dc3a7
commit 98c92b9033
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_node/node_select.cc
View File

@@ -1379,12 +1379,12 @@ static void node_find_exec_fn(bContext *C, void * /*arg1*/, void *arg2)
}
}
static uiBlock *node_find_menu(bContext *C, ARegion *region, void *arg_op)
static uiBlock *node_find_menu(bContext *C, ARegion *region, void *arg_optype)
{
static char search[256] = "";
uiBlock *block;
uiBut *but;
wmOperator *op = (wmOperator *)arg_op;
wmOperatorType *optype = (wmOperatorType *)arg_optype;
block = UI_block_begin(C, region, "_popup", UI_EMBOSS);
UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_MOVEMOUSE_QUIT | UI_BLOCK_SEARCH_MENU);
@@ -1401,7 +1401,7 @@ static uiBlock *node_find_menu(bContext *C, ARegion *region, void *arg_op)
UI_UNIT_Y,
"");
UI_but_func_search_set(
but, nullptr, node_find_update_fn, op->type, false, nullptr, node_find_exec_fn, nullptr);
but, nullptr, node_find_update_fn, optype, false, nullptr, node_find_exec_fn, nullptr);
UI_but_flag_enable(but, UI_BUT_ACTIVATE_ON_INIT);
/* Fake button holds space for search items. */
@@ -1427,7 +1427,7 @@ static uiBlock *node_find_menu(bContext *C, ARegion *region, void *arg_op)
static int node_find_node_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/)
{
UI_popup_block_invoke(C, node_find_menu, op, nullptr);
UI_popup_block_invoke(C, node_find_menu, op->type, nullptr);
return OPERATOR_CANCELLED;
}

4
source/blender/windowmanager/intern/wm_operators.cc
View File

@@ -1833,7 +1833,9 @@ int WM_operator_redo_popup(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
UI_popup_block_invoke(C, wm_block_create_redo, op, nullptr);
/* Refreshing not supported, because operator might get freed. */
const bool can_refresh = false;
UI_popup_block_invoke_ex(C, wm_block_create_redo, op, nullptr, can_refresh);
return OPERATOR_CANCELLED;
}