1 files changed, 7 insertions, 0 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index cb5b643..fa130a1 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -6276,6 +6276,13 @@ TkSetTransientFor(tkwin, parent)
 	while (!Tk_IsTopLevel(parent))
 	    parent = Tk_Parent(tkwin);
     }
+    /*
+     * Prevent crash due to incomplete initialization, or other problems.
+     * [Bugs 3554026, 3561016]
+     */
+    if (((TkWindow *)parent)->wmInfoPtr->wrapperPtr == NULL) {
+	return;
+    }
     XSetTransientForHint(Tk_Display(tkwin),
 	((TkWindow *)tkwin)->wmInfoPtr->wrapperPtr->window,
 	((TkWindow *)parent)->wmInfoPtr->wrapperPtr->window);