brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backends/native: Don't crash if keymap is misconfigured

Browse Source 
xkb recently gained support for user-specified keymaps, which means we
can no longer assume that the configuration data is necessarily fully
complete or correct; and the configuration language is quite a labyrinth,
so it's easy to get wrong. If setting the keymap fails, leave it in
whatever state it previously had, since that seems preferable to crashing
with a NULL pointer dereference.

Resolves: https://gitlab.gnome.org/GNOME/mutter/-/issues/1555
Signed-off-by: Simon McVittie <smcv@debian.org>
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1605>
This commit is contained in:
Simon McVittie 2020-11-26 11:54:48 +00:00 committed by Simon McVittie
parent 17dbb98811
commit 60f647df8e
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backends/native/meta-backend-native.c
View File

@ -284,6 +284,14 @@ meta_backend_native_set_keymap (MetaBackend *backend,
keymap = xkb_keymap_new_from_names (context, &names, XKB_KEYMAP_COMPILE_NO_FLAGS); keymap = xkb_keymap_new_from_names (context, &names, XKB_KEYMAP_COMPILE_NO_FLAGS);
xkb_context_unref (context); xkb_context_unref (context);
if (keymap == NULL)
{
g_warning ("Unable to load configured keymap: rules=%s, model=%s, layout=%s, variant=%s, options=%s",
DEFAULT_XKB_RULES_FILE, DEFAULT_XKB_MODEL, layouts,
variants, options);
return;
}
seat = clutter_backend_get_default_seat (clutter_backend); seat = clutter_backend_get_default_seat (clutter_backend);
meta_seat_native_set_keyboard_map (META_SEAT_NATIVE (seat), keymap); meta_seat_native_set_keyboard_map (META_SEAT_NATIVE (seat), keymap);

2
src/backends/native/meta-keymap-native.c
View File

@ -122,6 +122,8 @@ void
meta_keymap_native_set_keyboard_map (MetaKeymapNative *keymap, meta_keymap_native_set_keyboard_map (MetaKeymapNative *keymap,
struct xkb_keymap *xkb_keymap) struct xkb_keymap *xkb_keymap)
{ {
g_return_if_fail (xkb_keymap != NULL);
if (keymap->keymap) if (keymap->keymap)
xkb_keymap_unref (keymap->keymap); xkb_keymap_unref (keymap->keymap);
keymap->keymap = xkb_keymap_ref (xkb_keymap); keymap->keymap = xkb_keymap_ref (xkb_keymap);

1
src/backends/native/meta-seat-native.c
View File

@ -3124,6 +3124,7 @@ meta_seat_native_set_keyboard_map (MetaSeatNative *seat,
ClutterKeymap *keymap; ClutterKeymap *keymap;
g_return_if_fail (META_IS_SEAT_NATIVE (seat)); g_return_if_fail (META_IS_SEAT_NATIVE (seat));
g_return_if_fail (xkb_keymap != NULL);
keymap = clutter_seat_get_keymap (CLUTTER_SEAT (seat)); keymap = clutter_seat_get_keymap (CLUTTER_SEAT (seat));
meta_keymap_native_set_keyboard_map (META_KEYMAP_NATIVE (keymap), meta_keymap_native_set_keyboard_map (META_KEYMAP_NATIVE (keymap),