aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2025-10-18 06:23:53 +0000
committerDaniel Eklöf <daniel@ekloef.se>2025-10-18 06:23:53 +0000
commit558760446932f0f22c794084285cf998462dd706 (patch)
tree581135f5c00beafc5aa79a681982e0a565d2a236
parentchangelog: add new 'unreleased' section (diff)
input: keymap(): use a goto-label on error, to ensure we always close the keymap FD
-rw-r--r--input.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/input.c b/input.c
index fe5a8001..44a99e3b 100644
--- a/input.c
+++ b/input.c
@@ -576,23 +576,20 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
/* Verify keymap is in a format we understand */
switch ((enum wl_keyboard_keymap_format)format) {
case WL_KEYBOARD_KEYMAP_FORMAT_NO_KEYMAP:
- close(fd);
- return;
+ goto err;
case WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1:
break;
default:
LOG_WARN("unrecognized keymap format: %u", format);
- close(fd);
- return;
+ goto err;
}
char *map_str = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
if (map_str == MAP_FAILED) {
LOG_ERRNO("failed to mmap keyboard keymap");
- close(fd);
- return;
+ goto err;
}
while (map_str[size - 1] == '\0')
@@ -605,6 +602,8 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
}
+ munmap(map_str, size);
+
if (seat->kbd.xkb_keymap != NULL) {
seat->kbd.xkb_state = xkb_state_new(seat->kbd.xkb_keymap);
@@ -685,10 +684,10 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
seat->kbd.key_arrow_down = xkb_keymap_key_by_name(seat->kbd.xkb_keymap, "DOWN");
}
- munmap(map_str, size);
- close(fd);
-
key_binding_load_keymap(wayl->key_binding_manager, seat);
+
+err:
+ close(fd);
}
static void