[ab95811e07]: Aqua: prevent use-after-free crashes - Apply slightly better patch from Christopher Chavez to avoid use-after-free crashes.

1 files changed, 9 insertions, 9 deletions

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 0ddf627..3b451a0 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -47,36 +47,36 @@ static int		TkMacOSXGetAppPathCmd(ClientData cd, Tcl_Interp *ip,
 @synthesize tkPointerWindow = _tkPointerWindow;
 - (void) setTkPointerWindow: (TkWindow *)winPtr
 {
-    if (_tkPointerWindow) {
-	Tcl_Release(_tkPointerWindow);
-    }
     if (winPtr) {
 	Tcl_Preserve(winPtr);
     }
+    if (_tkPointerWindow) {
+	Tcl_Release(_tkPointerWindow);
+    }
     _tkPointerWindow = winPtr;
     return;
 }
 @synthesize tkEventTarget = _tkEventTarget;
 - (void) setTkEventTarget: (TkWindow *)winPtr
 {
-    if (_tkEventTarget) {
-	Tcl_Release(_tkEventTarget);
-    }
     if (winPtr) {
 	Tcl_Preserve(winPtr);
     }
+    if (_tkEventTarget) {
+	Tcl_Release(_tkEventTarget);
+    }
     _tkEventTarget = winPtr;
     return;
 }
 @synthesize tkDragTarget = _tkDragTarget;
 - (void) setTkDragTarget: (TkWindow *)winPtr
 {
-    if (_tkDragTarget) {
-	Tcl_Release(_tkDragTarget);
-    }
     if (winPtr) {
 	Tcl_Preserve(winPtr);
     }
+    if (_tkDragTarget) {
+	Tcl_Release(_tkDragTarget);
+    }
     _tkDragTarget = winPtr;
     return;
 }