mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-15 06:59:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not segfault when loading an unknown keymap

Browse source
This commit is contained in:
emersion 2017-12-18 15:11:05 +01:00
parent f3769a4b1f
commit 2c31cac116
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
types/wlr_keyboard.c
View file

@ -1,4 +1,3 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
@ -132,9 +131,12 @@ void wlr_keyboard_led_update(struct wlr_keyboard *kb, uint32_t leds) {
void wlr_keyboard_set_keymap(struct wlr_keyboard *kb,
struct xkb_keymap *keymap) {
wlr_log(L_DEBUG, "Keymap set");
kb->xkb_state = xkb_state_new(kb->keymap);
if (kb->xkb_state == NULL) {
wlr_log(L_ERROR, "Failed to create XKB state");
return;
}
kb->keymap = keymap;
assert(kb->xkb_state = xkb_state_new(kb->keymap));
const char *led_names[WLR_LED_COUNT] = {
XKB_LED_NAME_NUM,