From 50a938632dec4c07247a3179781219651bab9002 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 11 Jun 2012 18:53:12 +0200 Subject: [PATCH] * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't referenced. Fixes: debbugs:11583 --- src/ChangeLog | 5 +++++ src/nsterm.m | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 08e1c7dbd73..838703578c6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-06-11 Jan Djärv + + * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't + referenced (Bug#11583). + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/src/nsterm.m b/src/nsterm.m index 7cbaf991311..aad1f3283d6 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1158,14 +1158,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; } -- 2.39.2