diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2022-03-04 16:54:19 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2022-03-04 16:54:19 +0000 |
| commit | 6e536e7ed8f1de2615fa323123ddb2b06a45a179 (patch) | |
| tree | cab1826063b3597cad234d6077e11fb208332861 /input.c | |
| parent | dcs: prevent possibility of out-of-bounds reads in decrqss() (diff) | |
input: get_current_modifiers(): don’t crash if seat has no keyboard
Closes #963
Diffstat (limited to 'input.c')
| -rw-r--r-- | input.c | 21 |
1 files changed, 15 insertions, 6 deletions
@@ -1010,14 +1010,23 @@ get_current_modifiers(const struct seat *seat, xkb_mod_mask_t *effective, xkb_mod_mask_t *consumed, uint32_t key) { - if (effective != NULL) { - *effective = xkb_state_serialize_mods( - seat->kbd.xkb_state, XKB_STATE_MODS_EFFECTIVE); + if (unlikely(seat->kbd.xkb_state == NULL)) { + if (effective != NULL) + *effective = 0; + if (consumed != NULL) + *consumed = 0; } - if (consumed != NULL) { - *consumed = xkb_state_key_get_consumed_mods2( - seat->kbd.xkb_state, key, XKB_CONSUMED_MODE_XKB); + else { + if (effective != NULL) { + *effective = xkb_state_serialize_mods( + seat->kbd.xkb_state, XKB_STATE_MODS_EFFECTIVE); + } + + if (consumed != NULL) { + *consumed = xkb_state_key_get_consumed_mods2( + seat->kbd.xkb_state, key, XKB_CONSUMED_MODE_XKB); + } } } |
