From 98bfa4f1e61907686e3d59453e1e3d03f5411638 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 30 Jun 2014 20:44:56 +0200 Subject: [PATCH] Fix use of deallocated memory. * nsterm.h (EmacsScroller): Remove dealloc. * nsterm.m (judge): EmacsScroller: Move dealloc code here. (dealloc): Remove for EmacsScroller. --- src/ChangeLog | 7 +++++++ src/nsterm.h | 1 - src/nsterm.m | 12 +++--------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index ad34152d1a3..17dbd106df3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2014-06-30 Jan Djärv + + * nsterm.m (judge): EmacsScroller: Move dealloc code here. + (dealloc): Remove for EmacsScroller. + + * nsterm.h (EmacsScroller): Remove dealloc. + 2014-06-30 Eli Zaretskii * coding.c (MIN_CHARBUF_SIZE): Enlarge to 32. (Bug#17881) diff --git a/src/nsterm.h b/src/nsterm.h index e77aca3d50d..2619b710073 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -412,7 +412,6 @@ typedef float EmacsCGFloat; - 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 diff --git a/src/nsterm.m b/src/nsterm.m index 69738ba924a..f2eeeda93bf 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -7144,15 +7144,6 @@ if (cols > 0 && rows > 0) } -- (void)dealloc -{ - NSTRACE (EmacsScroller_dealloc); - if (!NILP (win)) - wset_vertical_scroll_bar (XWINDOW (win), Qnil); - [super dealloc]; -} - - - condemn { NSTRACE (condemn); @@ -7180,6 +7171,9 @@ if (cols > 0 && rows > 0) 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 (); -- 2.39.5