Merge changes from emacs-24; up to 2012-04-26T02:03:19Z!ueno@unixuser.org

2 files changed, 7 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d392dd522b3..8baeeadc2d5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-17  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
+        referenced (Bug#11583).
+
 2012-06-16  Aurelien Aptel  <aurelien.aptel@gmail.com>
 
         Implement wave-style variant of underlining.
diff --git a/src/nsterm.m b/src/nsterm.m
index 48057302090..dd4969a1e2e 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1155,14 +1155,14 @@ x_free_frame_resources (struct frame *f)
       hlinfo->mouse_face_mouse_frame = 0;
     }
 
-  xfree (f->output_data.ns);
-
   if (f->output_data.ns->miniimage != nil)
     [f->output_data.ns->miniimage release];
 
   [[view window] close];
   [view release];
 
+  xfree (f->output_data.ns);
+
   UNBLOCK_INPUT;
 }