From 402f10f351b178121bd2e4787a8322315df95bd2 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Thu, 26 May 2016 18:21:34 +0000
Subject: Fixed [79549a9134] - Mouse pointer warping crashes

---
 generic/tkBind.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 9cd3b7b..81c768b 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -3535,8 +3535,16 @@ DoWarp(
 {
     TkDisplay *dispPtr = clientData;
 
-    TkpWarpPointer(dispPtr);
-    XForceScreenSaver(dispPtr->display, ScreenSaverReset);
+    /*
+     * DoWarp was scheduled only if the window was mapped. It needs to be
+     * still mapped at the time the present idle callback is executed. In
+     * particular, this guards against window destruction in the meantime.
+     */
+
+    if (Tk_IsMapped(dispPtr->warpWindow)) {
+        TkpWarpPointer(dispPtr);
+        XForceScreenSaver(dispPtr->display, ScreenSaverReset);
+    }
     dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
 }
 
-- 
cgit v0.12


From 6a833c0141d490d970f3419e6d2ef5e62e3e9269 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Thu, 26 May 2016 20:46:06 +0000
Subject: More complete fix for [79549a9134] - Mouse pointer warping crashes,
 with a non-regression test case.

---
 generic/tkBind.c |  7 ++++---
 tests/bind.test  | 12 ++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 81c768b..4374494 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -3537,11 +3537,12 @@ DoWarp(
 
     /*
      * DoWarp was scheduled only if the window was mapped. It needs to be
-     * still mapped at the time the present idle callback is executed. In
-     * particular, this guards against window destruction in the meantime.
+     * still mapped at the time the present idle callback is executed. Also
+     * one needs to guard against window destruction in the meantime.
      */
 
-    if (Tk_IsMapped(dispPtr->warpWindow)) {
+    if (Tk_IsMapped(dispPtr->warpWindow)
+            && (Tk_WindowId(dispPtr->warpWindow) != None)) {
         TkpWarpPointer(dispPtr);
         XForceScreenSaver(dispPtr->display, ScreenSaverReset);
     }
diff --git a/tests/bind.test b/tests/bind.test
index 474771d..387b119 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6093,6 +6093,18 @@ test bind-31.7 {virtual event user_data field - unshared, asynch} -setup {
     destroy .t.f
 } -result {{} {} {TestUserData >b<}}
 
+test bind-32 {-warp, window was destroyed before the idle callback DoWarp} -setup {
+    frame .t.f
+    pack .t.f
+    focus -force .t.f
+    update
+} -body {
+    event generate .t.f <Button-1> -warp 1
+    destroy .t.f
+    update  ;  # shall simply not crash
+} -cleanup {
+} -result {}
+
 
 # cleanup
 cleanupTests
-- 
cgit v0.12