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

Fix #144716: Crash showing menus that referenced panels that don't exist

Browse Source 
Unregistering panels could cause popups to crash if those were
referenced. Now fallbacks, non popover behavior is used instead.
This commit is contained in:
Campbell Barton
2025-08-23 00:14:14 +10:00
parent 8ee6bc2c01
commit 40e876ab37
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/interface/interface_handlers.cc
View File

@@ -4387,6 +4387,9 @@ static void ui_block_open_begin(bContext *C, uiBut *but, uiHandleButtonData *dat
uiBlockHandleCreateFunc handlefunc = nullptr;
uiMenuCreateFunc menufunc = nullptr;
uiMenuCreateFunc popoverfunc = nullptr;
/* The checks for the panel type being null are for exceptional cases where script
* authors intentionally unregister built-in panels for example.
* While this should only ever happen rarely, it shouldn't crash, see #144716. */
PanelType *popover_panel_type = nullptr;
void *arg = nullptr;
@@ -4411,10 +4414,13 @@ static void ui_block_open_begin(bContext *C, uiBut *but, uiHandleButtonData *dat
case ButType::Menu:
BLI_assert(but->menu_create_func);
if (ui_but_menu_draw_as_popover(but)) {
popoverfunc = but->menu_create_func;
const char *idname = static_cast<const char *>(but->func_argN);
popover_panel_type = WM_paneltype_find(idname, false);
}
if (popover_panel_type) {
popoverfunc = but->menu_create_func;
}
else {
menufunc = but->menu_create_func;
arg = but->poin;
@@ -4431,10 +4437,13 @@ static void ui_block_open_begin(bContext *C, uiBut *but, uiHandleButtonData *dat
but->editvec = data->vec;
if (ui_but_menu_draw_as_popover(but)) {
popoverfunc = but->menu_create_func;
const char *idname = static_cast<const char *>(but->func_argN);
popover_panel_type = WM_paneltype_find(idname, false);
}
if (popover_panel_type) {
popoverfunc = but->menu_create_func;
}
else {
handlefunc = ui_block_func_COLOR;
}