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

Fix #116680: Crash disabling an add-on used in the file-selector

Browse Source 
Clear SpaceFile::op pointer when unregistering an operator to
prevent a use after free error.
This commit is contained in:
Campbell Barton
2024-02-27 13:04:38 +11:00
parent 2330e2564f
commit fe8e27ad17
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/windowmanager/intern/wm.cc
View File

@@ -384,6 +384,22 @@ void WM_operator_stack_clear(wmWindowManager *wm)
void WM_operator_handlers_clear(wmWindowManager *wm, wmOperatorType *ot)
{
LISTBASE_FOREACH (wmWindow *, win, &wm->windows) {
bScreen *screen = WM_window_get_active_screen(win);
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
switch (area->spacetype) {
case SPACE_FILE: {
SpaceFile *sfile = static_cast<SpaceFile *>(area->spacedata.first);
if (sfile->op && sfile->op->type == ot) {
/* Freed as part of the handler. */
sfile->op = nullptr;
}
break;
}
}
}
}
LISTBASE_FOREACH (wmWindow *, win, &wm->windows) {
ListBase *lb[2] = {&win->handlers, &win->modalhandlers};
for (int i = 0; i < ARRAY_SIZE(lb); i++) {