Merge core-8-6-branch so that new test imgPhoto-4.74 lands in the present bugfix branch as wellbug_d4fb4e80d2

1 files changed, 10 insertions, 0 deletions

diff --git a/generic/tkBind.c b/generic/tkBind.c
index d3fdc96..567c51f 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -1260,6 +1260,16 @@ Tk_BindEvent(
 	}
     }
 
+    /*
+     * Ignore event types which are not in flagArray and all zeroes there.
+     * Most notably, NoExpose events can fill the ring buffer and disturb
+     * (thus masking out) event sequences of interest.
+     */
+
+    if ((eventPtr->type >= TK_LASTEVENT) || !flagArray[eventPtr->type]) {
+       return;
+    }
+
     dispPtr = ((TkWindow *) tkwin)->dispPtr;
     bindInfoPtr = winPtr->mainPtr->bindInfo;