diff options
| author | Alan Third <alan@idiocy.org> | 2020-10-31 15:14:34 +0000 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2020-12-12 10:31:56 +0000 |
| commit | 6aa9fe3e1b4052b2acde86404a90e35893ebfa00 (patch) | |
| tree | 00cca83fd661799927f4ba6ebd421a7bc178b71d | |
| parent | 62a6934af9c110c28fc1f69f4bb1b79ce9d0c43d (diff) | |
| download | emacs-6aa9fe3e1b4052b2acde86404a90e35893ebfa00.tar.gz | |
Fix crash in ns_mouse_position (bug#44313)
* src/nsterm.m (ns_destroy_window): Close the window before freeing
the frame resources so we don't end up accessing the frame struct
after it's been freed.
(cherry picked from commit 18a7267c32a909bb26bd93d24543155aeb10e042)
| -rw-r--r-- | src/nsterm.m | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 3dd915e3703..4defeee7c3a 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1657,6 +1657,8 @@ ns_destroy_window (struct frame *f) { NSTRACE ("ns_destroy_window"); + check_window_system (f); + /* If this frame has a parent window, detach it as not doing so can cause a crash in GNUStep. */ if (FRAME_PARENT_FRAME (f) != NULL) @@ -1667,7 +1669,7 @@ ns_destroy_window (struct frame *f) [parent removeChildWindow: child]; } - check_window_system (f); + [[FRAME_NS_VIEW (f) window] close]; ns_free_frame_resources (f); ns_window_num--; } |