diff options
| author | Ran Benita <ran@unusedvar.com> | 2021-03-30 19:11:59 +0300 |
|---|---|---|
| committer | Ran Benita <ran@unusedvar.com> | 2021-03-30 19:17:29 +0300 |
| commit | 1c0e28ad2615b4dc1f816eb4e3abcc391e73784f (patch) | |
| tree | 57551dd51e00e55b88aa689b4f1912baec745efc /src | |
| parent | 1638409b22aef33d487863876ab214b949db4984 (diff) | |
| download | xorg-lib-libxkbcommon-1c0e28ad2615b4dc1f816eb4e3abcc391e73784f.tar.gz | |
keysym: properly handle overflow in 0x keysym names
Relatedly, strtoul allows a lot of unwanted stuff (spaces, +/- sign,
thousand seperators), we really ought not use it. But that's for another
time.
Signed-off-by: Ran Benita <ran@unusedvar.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/keysym.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/keysym.c b/src/keysym.c index 41098ed..dc30657 100644 --- a/src/keysym.c +++ b/src/keysym.c @@ -96,7 +96,7 @@ xkb_keysym_from_name(const char *name, enum xkb_keysym_flags flags) { const struct name_keysym *entry = NULL; char *tmp; - xkb_keysym_t val; + unsigned long val; bool icase = (flags & XKB_KEYSYM_CASE_INSENSITIVE); if (flags & ~XKB_KEYSYM_CASE_INSENSITIVE) @@ -174,24 +174,28 @@ xkb_keysym_from_name(const char *name, enum xkb_keysym_flags flags) } if (*name == 'U' || (icase && *name == 'u')) { + errno = 0; val = strtoul(&name[1], &tmp, 16); - if (tmp && *tmp != '\0') + if ((tmp && *tmp != '\0') || errno != 0) return XKB_KEY_NoSymbol; if (val < 0x20 || (val > 0x7e && val < 0xa0)) return XKB_KEY_NoSymbol; if (val < 0x100) - return val; + return (xkb_keysym_t) val; if (val > 0x10ffff) return XKB_KEY_NoSymbol; - return val | 0x01000000; + return (xkb_keysym_t) val | 0x01000000; } else if (name[0] == '0' && (name[1] == 'x' || (icase && name[1] == 'X'))) { + errno = 0; val = strtoul(&name[2], &tmp, 16); - if (tmp && *tmp != '\0') + if ((tmp && *tmp != '\0') || errno != 0) + return XKB_KEY_NoSymbol; + if (val > UINT32_MAX) return XKB_KEY_NoSymbol; - return val; + return (xkb_keysym_t) val; } /* Stupid inconsistency between the headers and XKeysymDB: the former has |