[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 06/36] qemu-keymap: properly check return from xkb_keymap_mod_
From: |
Alex Bennée |
Subject: |
[PATCH v3 06/36] qemu-keymap: properly check return from xkb_keymap_mod_get_index |
Date: |
Tue, 27 Jun 2023 17:06:30 +0100 |
We can return XKB_MOD_INVALID for AltGr which rightly gets flagged by
sanitisers as an overly wide shift attempt. Properly check the return
type and leave the bitmap as zero in that case. Tested output before
and after is unchanged with the gb and ara keymaps.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
---
qemu-keymap.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/qemu-keymap.c b/qemu-keymap.c
index 229866e004..8c80f7a4ed 100644
--- a/qemu-keymap.c
+++ b/qemu-keymap.c
@@ -140,6 +140,18 @@ static void usage(FILE *out)
names.options ?: "-");
}
+static xkb_mod_mask_t get_mod(struct xkb_keymap *map, const char *name)
+{
+ xkb_mod_index_t mod;
+ xkb_mod_mask_t mask = 0;
+
+ mod = xkb_keymap_mod_get_index(map, name);
+ if (mod != XKB_MOD_INVALID) {
+ mask = (1 << mod);
+ }
+ return mask;
+}
+
int main(int argc, char *argv[])
{
struct xkb_context *ctx;
@@ -215,14 +227,10 @@ int main(int argc, char *argv[])
mod, xkb_keymap_mod_get_name(map, mod));
}
- mod = xkb_keymap_mod_get_index(map, "Shift");
- shift = (1 << mod);
- mod = xkb_keymap_mod_get_index(map, "Control");
- ctrl = (1 << mod);
- mod = xkb_keymap_mod_get_index(map, "AltGr");
- altgr = (1 << mod);
- mod = xkb_keymap_mod_get_index(map, "NumLock");
- numlock = (1 << mod);
+ shift = get_mod(map, "Shift");
+ ctrl = get_mod(map, "Control");
+ altgr = get_mod(map, "AltGr");
+ numlock = get_mod(map, "NumLock");
state = xkb_state_new(map);
xkb_keymap_key_for_each(map, walk_map, state);
--
2.39.2
- [PATCH v3 00/36] maintainer omnibus: testing, fuzz, plugins, documentation (pre-PR), Alex Bennée, 2023/06/27
- [PATCH v3 02/36] gitlab: ensure coverage job also publishes meson log, Alex Bennée, 2023/06/27
- [PATCH v3 01/36] gitlab: explicit set artifacts publishing criteria, Alex Bennée, 2023/06/27
- [PATCH v3 04/36] docs/devel: remind developers to run CI container pipeline when updating images, Alex Bennée, 2023/06/27
- [PATCH v3 03/36] gitlab: reduce testing scope of check-gcov, Alex Bennée, 2023/06/27
- [PATCH v3 10/36] Makefile: add lcitool-refresh to UNCHECKED_GOALS, Alex Bennée, 2023/06/27
- [PATCH v3 06/36] qemu-keymap: properly check return from xkb_keymap_mod_get_index,
Alex Bennée <=
- [PATCH v3 13/36] tests/lcitool: add an explicit gcc-native package, Alex Bennée, 2023/06/27
- [PATCH v3 07/36] scripts/oss-fuzz: add a suppression for keymap, Alex Bennée, 2023/06/27
- [PATCH v3 11/36] tests/lcitool: update to latest version, Alex Bennée, 2023/06/27
- [PATCH v3 09/36] tests/docker: add test-fuzz, Alex Bennée, 2023/06/27
- [PATCH v3 05/36] tests/tcg: add mechanism to handle plugin arguments, Alex Bennée, 2023/06/27
- [PATCH v3 12/36] tests/lcitool: Bump fedora container versions, Alex Bennée, 2023/06/27
- [PATCH v3 08/36] tests/qtests: clean-up and fix leak in generic_fuzz, Alex Bennée, 2023/06/27
- [PATCH v3 15/36] tests/docker: convert riscv64-cross to lcitool, Alex Bennée, 2023/06/27
- [PATCH v3 16/36] tests/avocado: update firmware to enable sbsa-ref/max, Alex Bennée, 2023/06/27
- [PATCH v3 14/36] tests/lcitool: introduce qemu-minimal, Alex Bennée, 2023/06/27