StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Pierre Le Marre 2023-07-04 09:23:24 +02:00 committed by Wismill
parent 0da68bc648
commit 7a815ad307
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/xkbcomp/expr.c
View File

@ -29,6 +29,7 @@
#include "xkbcomp-priv.h" #include "xkbcomp-priv.h"
#include "text.h" #include "text.h"
#include "expr.h" #include "expr.h"
#include "keysym.h"
typedef bool (*IdentLookupFunc)(struct xkb_context *ctx, const void *priv, typedef bool (*IdentLookupFunc)(struct xkb_context *ctx, const void *priv,
xkb_atom_t field, enum expr_value_type type, 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)) if (!ExprResolveInteger(ctx, expr, &val))
return false; 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; return false;
}
/* Special case for digits 0..9 */
if (val < 10) {
*sym_rtrn = XKB_KEY_0 + (xkb_keysym_t) val; *sym_rtrn = XKB_KEY_0 + (xkb_keysym_t) val;
return true; 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;
} }
bool bool