(XTread_socket): Check Lisp types for Vx_keysym_table

and fix C types.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/xterm.c b/src/xterm.c
index d878d6cce86..b6c63aacfa1 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10571,14 +10571,15 @@ XTread_socket (sd, bufp, numchars, expected)
                           numchars--;
                         }
                       /* Now non-ASCII.  */
-                      else if (! EQ ((c = Fgethash (make_number (keysym),
-                                                    Vx_keysym_table, Qnil)),
-                                     Qnil))
+                      else if (HASH_TABLE_P (Vx_keysym_table)
+                               && (CHARACTERP (c = Fgethash (make_number (keysym),
+                                                             Vx_keysym_table,
+                                                             Qnil))))
                         {
-                          bufp->kind = (ASCII_CHAR_P (c)
+                          bufp->kind = (ASCII_CHAR_P (XFASTINT (c))
                                         ? ascii_keystroke
                                         : multibyte_char_keystroke);
-                          bufp->code = c;
+                          bufp->code = XFASTINT (c);
                           XSETFRAME (bufp->frame_or_window, f);
                           bufp->arg = Qnil;
                           bufp->modifiers