projects
/
platform
/
upstream
/
libxkbcommon.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
96df310
)
xkbcomp: Don't explode on invalid virtual modifiers
author
Daniel Stone
<daniels@collabora.com>
Mon, 26 Jun 2017 16:18:16 +0000
(17:18 +0100)
committer
Daniel Stone
<daniels@collabora.com>
Fri, 3 Aug 2018 15:14:16 +0000
(16:14 +0100)
testcase: 'virtualModifiers=LevelThreC'
Signed-off-by: Daniel Stone <daniels@collabora.com>
src/xkbcomp/expr.c
patch
|
blob
|
history
diff --git
a/src/xkbcomp/expr.c
b/src/xkbcomp/expr.c
index
5d43cba
..
91713da
100644
(file)
--- a/
src/xkbcomp/expr.c
+++ b/
src/xkbcomp/expr.c
@@
-101,6
+101,8
@@
LookupModMask(struct xkb_context *ctx, const void *priv, xkb_atom_t field,
return false;
str = xkb_atom_text(ctx, field);
+ if (!str)
+ return false;
if (istreq(str, "all")) {
*val_rtrn = MOD_REAL_MASK_ALL;