[Bf-blender-cvs] [1c18f05f0be] master: Fix T92252: User after free when opening file after Blender starts
Campbell Barton
noreply at git.blender.org
Sat Oct 16 07:15:13 CEST 2021
Commit: 1c18f05f0be0e31c135462d3dea763e97dd26698
Author: Campbell Barton
Date: Sat Oct 16 15:35:36 2021 +1100
Branches: master
https://developer.blender.org/rB1c18f05f0be0e31c135462d3dea763e97dd26698
Fix T92252: User after free when opening file after Blender starts
Oversight in 6e4ab5b761b03b52177985ecbeb2c2f576159c74
===================================================================
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index df4d2c13ba7..d05076bafe2 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -3161,10 +3161,10 @@ static int wm_handlers_do_intern(bContext *C, wmWindow *win, wmEvent *event, Lis
/* This calls handlers twice - to solve (double-)click events. */
static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
{
+ int action = wm_handlers_do_intern(C, CTX_wm_window(C), event, handlers);
+
/* Will be NULL in the file read case. */
wmWindow *win = CTX_wm_window(C);
- int action = wm_handlers_do_intern(C, win, event, handlers);
-
if (win == NULL) {
return action;
}
More information about the Bf-blender-cvs
mailing list