diff options
| author | CismonX <admin@cismon.net> | 2026-10-14 14:00:31 +0000 |
|---|---|---|
| committer | CismonX <admin@cismon.net> | 2026-10-14 14:00:31 +0000 |
| commit | faa4b09b9fbbe0080d4db587119056e52831d37f (patch) | |
| tree | c47c6a3ad58049544b87321b883377b40c883f6a | |
| parent | grid: reflow: fix two issues when truncating wide characters (diff) | |
input: no need to strip trailing NULs from keymap
Since libxkbcommon 1.6.0, xkb_keymap_new_from_buffer() allows a
NUL-terminated string as keymap text [1]. Also the keymap text cannot
have multiple trailing NULs according to the Wayland protocol spec.
This also avoids length mismatch for munmap(), which may leak resource
when 'size % sysconf(_SC_PAGESIZE) == 1'.
Also see the original patch [2] which reported this issue.
[1]: https://github.com/xkbcommon/libxkbcommon/commit/b06aedb8ba
[2]: https://codeberg.org/dnkl/foot/pulls/2482
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | input.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ac3422d5..e6fbae78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -90,9 +90,11 @@ application exit simultaneously in a short window ([#2432][2432]). * Crash when a buggy compositor sends an `ime_enter()` event with a `NULL` surface ([#2467][2467]). +* Possible memory leak when processing keymap data ([#2482][2482]). [2342]: https://codeberg.org/dnkl/foot/pulls/2432 [2342]: https://codeberg.org/dnkl/foot/issues/2467 +[2482]: https://codeberg.org/dnkl/foot/pulls/2482 ### Security @@ -600,9 +600,6 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard, goto err; } - while (map_str[size - 1] == '\0') - size--; - if (seat->kbd.xkb != NULL) { seat->kbd.xkb_keymap = xkb_keymap_new_from_buffer( seat->kbd.xkb, map_str, size, XKB_KEYMAP_FORMAT_TEXT_V1, |
