diff options
| author | Aaron Jensen | 2018-03-21 22:30:08 -0700 |
|---|---|---|
| committer | Alan Third | 2018-03-25 20:13:05 +0100 |
| commit | 95ccf50e37dc5a55ea19283ef208e4fd3aad5ff8 (patch) | |
| tree | 3a2edebe36072a6a4d4029ed44307ff184a487f1 /src | |
| parent | 45d04754e718846b1a2a84a1eac6b5a54f3ade16 (diff) | |
| download | emacs-95ccf50e37dc5a55ea19283ef208e4fd3aad5ff8.tar.gz emacs-95ccf50e37dc5a55ea19283ef208e4fd3aad5ff8.zip | |
Fix crash after frame is freed on macOS (bug#30800)
* src/nsterm.m (x_free_frame_resources): Clear represented_frame.
(bug#30800)
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 3d58cd5ec64..c8ae31abc09 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -1692,6 +1692,10 @@ x_free_frame_resources (struct frame *f) | |||
| 1692 | dpyinfo->x_highlight_frame = 0; | 1692 | dpyinfo->x_highlight_frame = 0; |
| 1693 | if (f == hlinfo->mouse_face_mouse_frame) | 1693 | if (f == hlinfo->mouse_face_mouse_frame) |
| 1694 | reset_mouse_highlight (hlinfo); | 1694 | reset_mouse_highlight (hlinfo); |
| 1695 | /* Ensure that sendEvent does not attempt to dereference a freed | ||
| 1696 | frame. (bug#30800) */ | ||
| 1697 | if (represented_frame == f) | ||
| 1698 | represented_frame = NULL; | ||
| 1695 | 1699 | ||
| 1696 | if (f->output_data.ns->miniimage != nil) | 1700 | if (f->output_data.ns->miniimage != nil) |
| 1697 | [f->output_data.ns->miniimage release]; | 1701 | [f->output_data.ns->miniimage release]; |