Commit 7a815ad30718a7551bed36f217c1475aa6187161
2023-07-04T09:23:24
Fix parsing of numeric keysyms in ExprResolveKeySym `ExprResolveKeySym` in `expr.c` does not parse non-digit numeric keysyms. Fixed by checking upper bound; also add warning messages.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index dbdf734..bbdf038 100644
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -29,6 +29,7 @@
#include "xkbcomp-priv.h"
#include "text.h"
#include "expr.h"
+#include "keysym.h"
typedef bool (*IdentLookupFunc)(struct xkb_context *ctx, const void *priv,
xkb_atom_t field, enum expr_value_type type,
@@ -656,11 +657,26 @@ ExprResolveKeySym(struct xkb_context *ctx, const ExprDef *expr,
if (!ExprResolveInteger(ctx, expr, &val))
return false;
- if (val < 0 || val >= 10)
+ if (val < XKB_KEYSYM_MIN) {
+ log_warn(ctx, "unrecognized keysym \"-0x%x\" (%d)\n",
+ (unsigned int) -val, val);
return false;
+ }
+
+ /* Special case for digits 0..9 */
+ if (val < 10) {
+ *sym_rtrn = XKB_KEY_0 + (xkb_keysym_t) val;
+ return true;
+ }
+
+ if (val <= XKB_KEYSYM_MAX) {
+ *sym_rtrn = (xkb_keysym_t) val;
+ return true;
+ }
+
+ log_warn(ctx, "unrecognized keysym \"0x%x\" (%d)\n", val, val);
+ return false;
- *sym_rtrn = XKB_KEY_0 + (xkb_keysym_t) val;
- return true;
}
bool