summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorculler <culler>2021-06-03 23:12:24 (GMT)
committerculler <culler>2021-06-03 23:12:24 (GMT)
commit03f9d27042389b6edb846a769b312f7b596c80a8 (patch)
treebfde5413cb1cb4433394deef60a51c377f4e9aa0
parent4b6536fe00cccdbee717f125f0da5ec5393a3926 (diff)
downloadtk-03f9d27042389b6edb846a769b312f7b596c80a8.zip
tk-03f9d27042389b6edb846a769b312f7b596c80a8.tar.gz
tk-03f9d27042389b6edb846a769b312f7b596c80a8.tar.bz2
Fix [099109cf1f]: crash when destroying an embedded window if the container has multiple embedded windows -- this commit uses Christopher Chavez's patch for Aqua only.
-rw-r--r--macosx/tkMacOSXEmbed.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index 4af2e75..2f04e74 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -1116,6 +1116,9 @@ EmbedWindowDeleted(
prevPtr = NULL;
containerPtr = firstContainerPtr;
while (1) {
+ if (containerPtr == NULL) {
+ return;
+ }
if (containerPtr->embeddedPtr == winPtr) {
/*
* We also have to destroy our parent, to clean up the container.