From: Aaron Jensen <aaronjensen@gmail.com>
Date: Thu, 22 Mar 2018 05:30:08 +0000 (-0700)
Subject: Fix crash after frame is freed on macOS (bug#30800)
X-Git-Tag: emacs-26.1-rc1~41
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95ccf50;p=emacs.git

Fix crash after frame is freed on macOS (bug#30800)

* src/nsterm.m (x_free_frame_resources): Clear represented_frame.
(bug#30800)
---

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)
     dpyinfo->x_highlight_frame = 0;
   if (f == hlinfo->mouse_face_mouse_frame)
     reset_mouse_highlight (hlinfo);
+  /* Ensure that sendEvent does not attempt to dereference a freed
+     frame. (bug#30800) */
+  if (represented_frame == f)
+    represented_frame = NULL;
 
   if (f->output_data.ns->miniimage != nil)
     [f->output_data.ns->miniimage release];