summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-07-22 12:40:27 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-07-22 12:40:27 (GMT)
commit6136564c811a8437f8504e16baa4ccefcc87df36 (patch)
tree1e81feb5f2ee8f3e2b8d450e3583186352a5d283 /generic
parent7ae99b0a688d4b4d52dc35e53de2cc40b59ca759 (diff)
parent077b98131bbf66a3363e3c450447af6c9edf77cf (diff)
downloadtk-6136564c811a8437f8504e16baa4ccefcc87df36.zip
tk-6136564c811a8437f8504e16baa4ccefcc87df36.tar.gz
tk-6136564c811a8437f8504e16baa4ccefcc87df36.tar.bz2
[450bb0ecad] Fix corruption [tk busy] creates on OSX.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkBusy.c4
-rw-r--r--generic/tkWindow.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/generic/tkBusy.c b/generic/tkBusy.c
index 65248a2..b36d453 100644
--- a/generic/tkBusy.c
+++ b/generic/tkBusy.c
@@ -433,6 +433,10 @@ MakeTransparentWindowExist(
TkpMakeTransparentWindowExist(tkwin, parent);
+ if (winPtr->window == None) {
+ return; /* Platform didn't make Window. */
+ }
+
dispPtr = winPtr->dispPtr;
hPtr = Tcl_CreateHashEntry(&dispPtr->winTable, (char *) winPtr->window,
&notUsed);
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 81ea0e5..a55c867 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -2358,6 +2358,9 @@ Tk_IdToWindow(
break;
}
}
+ if (window == None) {
+ return NULL;
+ }
hPtr = Tcl_FindHashEntry(&dispPtr->winTable, (char *) window);
if (hPtr == NULL) {