Fix [ba956c8ff7]: Aqua: TIP 655 use-after-free.

tcltk · May 3, 2023 · 368221a · 368221a
1 parent f5c88a9
commit 368221a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
@@ -6698,7 +6698,6 @@ TkMacOSXMakeRealWindowExist(
 	if (hPtr) {
 	    tabbingId = Tcl_GetHashValue(hPtr);
 	    Tcl_DeleteHashEntry(hPtr);
-	    ckfree(tabbingId);
 	}
 	hPtr = Tcl_FindHashEntry(&pathnameToTabbingMode, Tk_PathName(winPtr));
 	if (hPtr) {
@@ -6763,6 +6762,9 @@ TkMacOSXMakeRealWindowExist(
     [window setTabbingIdentifier: identifier];
     [window setTabbingMode: tabbingMode];
 #endif
+    if (tabbingId) {
+	ckfree(tabbingId);
+    }
     TKContentView *contentView = [[TKContentView alloc]
 				     initWithFrame:NSZeroRect];
     [window setContentView:contentView];