[Emacs-diffs] trunk r117453: Fix use of deallocated memory.

[Jan D.]

------------------------------------------------------------
revno: 117453
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Mon 2014-06-30 20:44:56 +0200
message:
  Fix use of deallocated memory.
  
  * nsterm.h (EmacsScroller): Remove dealloc.
  
  * nsterm.m (judge): EmacsScroller: Move dealloc code here.
  (dealloc): Remove for EmacsScroller.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.h                   nsterm.h-20091113204419-o5vbwnq5f7feedwu-8746
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-30 15:39:29 +0000
+++ b/src/ChangeLog     2014-06-30 18:44:56 +0000
@@ -1,3 +1,10 @@
+2014-06-30  Jan Djärv  <address@hidden>
+
+       * nsterm.m (judge): EmacsScroller: Move dealloc code here.
+       (dealloc): Remove for EmacsScroller.
+
+       * nsterm.h (EmacsScroller): Remove dealloc.
+
 2014-06-30  Eli Zaretskii  <address@hidden>
 
        * coding.c (MIN_CHARBUF_SIZE): Enlarge to 32.  (Bug#17881)

=== modified file 'src/nsterm.h'
--- a/src/nsterm.h      2014-06-11 17:57:51 +0000
+++ b/src/nsterm.h      2014-06-30 18:44:56 +0000
@@ -412,7 +412,6 @@
 
 - initFrame: (NSRect )r window: (Lisp_Object)win;
 - (void)setFrame: (NSRect)r;
-- (void)dealloc;
 
 - setPosition: (int) position portion: (int) portion whole: (int) whole;
 - (int) checkSamePosition: (int)position portion: (int)portion

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2014-06-30 12:38:09 +0000
+++ b/src/nsterm.m      2014-06-30 18:44:56 +0000
@@ -7144,15 +7144,6 @@
 }
 
 
-- (void)dealloc
-{
-  NSTRACE (EmacsScroller_dealloc);
-  if (!NILP (win))
-    wset_vertical_scroll_bar (XWINDOW (win), Qnil);
-  [super dealloc];
-}
-
-
 - condemn
 {
   NSTRACE (condemn);
@@ -7180,6 +7171,9 @@
       view = (EmacsView *)FRAME_NS_VIEW (frame);
       if (view != nil)
         view->scrollbarsNeedingUpdate++;
+      if (!NILP (win))
+        wset_vertical_scroll_bar (XWINDOW (win), Qnil);
+      win = Qnil;
       [self removeFromSuperview];
       [self release];
       unblock_input ();