Protect against XKB being stupid. Reported by Pedro Villavicencio.

* gdk/x11/gdkkeys-x11.c (_gdk_keymap_key_is_modifier): Protect
        against XKB being stupid. Reported by Pedro Villavicencio.



svn path=/trunk/; revision=20413
This commit is contained in:
Matthias Clasen 2008-06-17 02:11:47 +00:00
parent 9dd2aa7edc
commit 080253c257
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2008-06-16 Matthias Clasen <mclasen@redhat.com>
Bug 508751 gnome-terminal crashed with SIGSEGV after keypress
* gdk/x11/gdkkeys-x11.c (_gdk_keymap_key_is_modifier): Protect
against XKB being stupid. Reported by Pedro Villavicencio.
2008-06-17 Michael Natterer <mitch@imendio.com> 2008-06-17 Michael Natterer <mitch@imendio.com>
* gtk/gtkplug.c (_gtk_plug_send_delete_event): use g_object_ref() * gtk/gtkplug.c (_gtk_plug_send_delete_event): use g_object_ref()

View File

@ -1661,7 +1661,7 @@ _gdk_keymap_key_is_modifier (GdkKeymap *keymap,
{ {
XkbDescRec *xkb = get_xkb (keymap_x11); XkbDescRec *xkb = get_xkb (keymap_x11);
if (xkb->map->modmap[keycode] != 0) if (xkb->map->modmap && xkb->map->modmap[keycode] != 0)
return TRUE; return TRUE;
} }
else else