Make sure we don't trigger undefined behavior in isprint().

svn path=/trunk/; revision=19978

1 files changed, 7 insertions, 1 deletions

diff --git a/gtk/main.c b/gtk/main.c
index d64fcf348f..736a997a5e 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -3806,7 +3806,13 @@ top_level_key_pressed_cb(GtkCTree *ctree _U_, GdkEventKey *event, gpointer user_
     } else if (event->keyval == GDK_F7) {
 	packet_list_prev();
 	return TRUE;
-    } else if (isprint(event->keyval)) {
+    /*
+     * A comment in gdkkeysyms.h says that it's autogenerated from
+     * freedesktop.org/x.org's keysymdef.h.  Although the GDK docs
+     * don't explicitly say so, isprint() should work as expected
+     * for values < 127.
+     */
+    } else if (isascii(event->keyval) && isprint(event->keyval)) {
 	/* Forward the keypress on to the display filter entry */
 	if (main_display_filter_widget && !gtk_widget_is_focus(main_display_filter_widget)) {
 	    gtk_window_set_focus(GTK_WINDOW(top_level), main_display_filter_widget);