Fix segfault on forcible window closure.

git-svn-id: svn://svn.tartarus.org/sgt/putty@5402 cda61777-01e9-0310-a592-d414129be87e

diff --git a/macosx/README.OSX b/macosx/README.OSX
index 0e05dba..7a9ca95 100644 (file)
--- a/macosx/README.OSX
+++ b/macosx/README.OSX
@@ -49,8 +49,6 @@ Missing input features
  - use of Alt+numberpad to enter arbitrary numeric character codes
    is not yet supported
 
- - cut and paste isn't supported
-
  - there's no Meta key yet. (I'd like to at least have the
    possibility of using Command rather than Option as the Meta key,
    since the latter is necessary to send some characters, including
@@ -63,6 +61,9 @@ Missing input features
 
  - there's no specials menu
 
+ - mouse activity isn't supported (neither cut-and-paste nor xterm
+   mouse tracking)
+
 Missing terminal emulation features
 -----------------------------------
 
@@ -75,8 +76,6 @@ Missing terminal emulation features
 Other missing features
 ----------------------
 
- - SessionWindow's dealloc method does nothing yet, so leaks memory
-
  - no Event Log
 
  - no mid-session Change Settings

diff --git a/macosx/osxwin.m b/macosx/osxwin.m
index f0ebee4..59cc4bf 100644 (file)
--- a/macosx/osxwin.m
+++ b/macosx/osxwin.m
@@ -313,14 +313,16 @@
      * Do so.
      */
     sfree(alert_ctx);
-    if (term)
-       term_free(term);
-    if (logctx)
-       log_free(logctx);
     if (back)
        back->free(backhandle);
     if (ldisc)
        ldisc_free(ldisc);
+    /* ldisc must be freed before term, since ldisc_free expects term
+     * still to be around. */
+    if (logctx)
+       log_free(logctx);
+    if (term)
+       term_free(term);
     [super dealloc];
 }