Moved range check of keycode to TkpSetKeycodeAndState for ticket [382712ad].

1 files changed, 17 insertions, 23 deletions

diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index c5a024f..6d4d0cf 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -110,7 +110,7 @@ TkpGetString(
     XEvent *eventPtr,		/* X keyboard event. */
     Tcl_DString *dsPtr)		/* Initialized, empty string to hold result. */
 {
-    int len, mincode, maxcode;
+    int len;
     Tcl_DString buf;
     TkKeyEvent *kePtr = (TkKeyEvent *) eventPtr;
 
@@ -136,27 +136,6 @@ TkpGetString(
 	goto done;
     }
 
-    /*
-     * Filter keycodes out of range, otherwise
-     * further Xlib function behavior might be undefined.
-     */
-
-    mincode = 0;
-    maxcode = -1;
-    XDisplayKeycodes(winPtr->dispPtr->display, &mincode, &maxcode);
-    if ((eventPtr->xkey.keycode < mincode) ||
-	(eventPtr->xkey.keycode > maxcode)) {
-        if (eventPtr->xkey.keycode != 0) {
-	    len = 0;
-	    Tcl_DStringSetLength(dsPtr, len);
-	    goto done;
-        }
-        /*
-         * Keycode 0 seems to come from e.g. ibus input methods,
-         * we let this pass and hope for the best.
-         */
-    }
-
 #ifdef TK_USE_INPUT_METHODS
     if ((winPtr->dispPtr->flags & TK_DISPLAY_USE_IM)
 	    && (winPtr->inputContext != NULL)
@@ -269,7 +248,7 @@ TkpSetKeycodeAndState(
     XEvent *eventPtr)
 {
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
-    int state;
+    int state, mincode, maxcode;
     KeyCode keycode;
 
     if (keySym == NoSymbol) {
@@ -291,6 +270,21 @@ TkpSetKeycodeAndState(
 	    }
 	}
     }
+
+    /*
+     * Filter keycodes out of range, otherwise further Xlib function
+     * behavior might be undefined, in particular XIM could cause crashes.
+     */
+
+    mincode = 0;
+    maxcode = -1;
+    XDisplayKeycodes(dispPtr->display, &mincode, &maxcode);
+    if (keycode < mincode) {
+	keycode = mincode;
+    } else if (keycode > maxcode) {
+	keycode = maxcode;
+    }
+
     eventPtr->xkey.keycode = keycode;
 }