emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108036: * nsterm.m (x_free_frame_


From: Jan D.
Subject: [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108036: * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
Date: Mon, 11 Jun 2012 18:53:12 +0200
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 108036
fixes bug: http://debbugs.gnu.org/11583
committer: Jan D. <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-06-11 18:53:12 +0200
message:
  * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
  referenced.
modified:
  src/ChangeLog
  src/nsterm.m
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-01 09:51:00 +0000
+++ b/src/ChangeLog     2012-06-11 16:53:12 +0000
@@ -1,3 +1,8 @@
+2012-06-11  Jan Djärv  <address@hidden>
+
+       * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't
+       referenced (Bug#11583).
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-04-09 10:01:04 +0000
+++ b/src/nsterm.m      2012-06-11 16:53:12 +0000
@@ -1158,14 +1158,14 @@
       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;
 }
 


reply via email to

[Prev in Thread] Current Thread [Next in Thread]