Fix [fdc0ed342d]: Segfault on focus -force with xvfb.

tcltk · Mar 19, 2024 · 2a8bde2 · 2a8bde2
2 parents a2d776d + 29c3ce9
commit 2a8bde2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/generic/tkFocus.c b/generic/tkFocus.c
@@ -73,7 +73,7 @@ typedef struct TkDisplayFocusInfo {
 
 #define DEBUG(dispPtr, arguments) \
     if ((dispPtr)->focusDebug) { \
-	printf arguments; \
+	printf arguments; fflush(stdout); \
     }
 
 /*
@@ -501,12 +501,13 @@ TkFocusFilterEvent(
 
 	if ((dispPtr->implicitWinPtr != NULL)
 		&& !(winPtr->flags & TK_EMBEDDED)) {
-	    DEBUG(dispPtr, ("Defocussed implicit Async\n"));
+	    DEBUG(dispPtr, ("Defocussed implicit Async from %s\n", displayFocusPtr->focusWinPtr->pathName));
 	    GenerateFocusEvents(displayFocusPtr->focusWinPtr, NULL);
 	    XSetInputFocus(dispPtr->display, PointerRoot, RevertToPointerRoot,
 		    CurrentTime);
 	    displayFocusPtr->focusWinPtr = NULL;
 	    dispPtr->implicitWinPtr = NULL;
+	    dispPtr->focusPtr = NULL;
 	}
     }
     return retValue;

diff --git a/tests/focus.test b/tests/focus.test
@@ -755,6 +755,29 @@ test focus-7.1 {TkSetFocusWin procedure, unmapped windows} -setup {
     destroy .top
 } -result {.top.s3}
 
+test focus-8.1 {fdc0ed342d - segfault on focus -force} -body {
+    pack [button .b0]
+    toplevel .one
+    update
+    event generate .one <Motion> -warp 1 -x 175 -y 175
+    update idletasks
+    destroy {*}[winfo children .]
+    toplevel .t
+    pack [canvas .t.c]
+    update
+    destroy .t.c
+    pack [label .t.l]
+    update
+    destroy .t.l
+    destroy {*}[winfo children .]
+    proc crashit {} {
+	pack [listbox .l]
+	update
+	focus -force .l;  # This line segfaulted *with xvfb*
+	set res Reached
+    }
+    crashit
+} -result {Reached}
 
 deleteWindows