summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-10-24 19:21:41 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-10-24 19:21:41 (GMT)
commitdafa4d1504763f0809dfb3fd0ffa19f289a42888 (patch)
tree76a50d14d8f6d2c5a41b0fbd27b7ea2a17c2b640
parent40af4f0e8c40ef3a1bc01189d45ddd921cc14550 (diff)
parent65a7afe8edb4a3261f46a2e244503dd85066e1fe (diff)
downloadtk-dafa4d1504763f0809dfb3fd0ffa19f289a42888.zip
tk-dafa4d1504763f0809dfb3fd0ffa19f289a42888.tar.gz
tk-dafa4d1504763f0809dfb3fd0ffa19f289a42888.tar.bz2
3574893 Add overlooked toplevel ref count maintenance in the [wm manage|forget]
operations that could cause segfaults due to premature free of structs.
-rw-r--r--ChangeLog6
-rw-r--r--macosx/tkMacOSXWm.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d34f48..75aaa8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-24 Don Porter <dgp@users.sourceforge.net>
+
+ * macosx/tkMacOSXWm.c: [Bug 3574893] Add overlooked toplevel ref
+ count maintenance in the [wm manage|forget] operations that could
+ cause segfaults due to premature free of structs.
+
2012-09-19 Jan Nijtmans <nijtmans@users.sf.net>
* win/Makefile.in: Compile win32 binaries with -DTCL_NO_DEPRECATED
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 1bf6d2c..68cbb00 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -1659,7 +1659,9 @@ WmForgetCmd(
TkFocusJoin(winPtr);
Tk_UnmapWindow(frameWin);
+ macWin->toplevel->referenceCount--;
macWin->toplevel = winPtr->parentPtr->privatePtr->toplevel;
+ macWin->toplevel->referenceCount++;
macWin->flags &= ~TK_HOST_EXISTS;
TkWmDeadWindow(winPtr);
@@ -2448,7 +2450,9 @@ WmManageCmd(
}
wmPtr = winPtr->wmInfoPtr;
winPtr->flags &= ~TK_MAPPED;
+ macWin->toplevel->referenceCount--;
macWin->toplevel = macWin;
+ macWin->toplevel->referenceCount++;
RemapWindows(winPtr, macWin);
winPtr->flags |=
(TK_TOP_HIERARCHY|TK_TOP_LEVEL|TK_HAS_WRAPPER|TK_WIN_MANAGED);
@@ -6599,7 +6603,9 @@ RemapWindows(
if (winPtr->window != None) {
MacDrawable *macWin = (MacDrawable *) winPtr->window;
+ macWin->toplevel->referenceCount--;
macWin->toplevel = parentWin->toplevel;
+ macWin->toplevel->referenceCount++;
winPtr->flags &= ~TK_MAPPED;
#ifdef TK_REBUILD_TOPLEVEL
winPtr->flags |= TK_REBUILD_TOPLEVEL;