diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-04-25 19:47:16 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 15:08:57 +1100 |
| commit | 61c508fa78aa08ea2666fde950fbafad95d65056 (patch) | |
| tree | 0a63921127f1ce11c6842d3497c12f3ca4a4953c /xkb/xkmread.c | |
| parent | 4f3078df2acf07364a17f738bc5c32f9a5962723 (diff) | |
XKB: Sanitise vmods in actions
Turn vmods from two unsigned chars into one int.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'xkb/xkmread.c')
| -rw-r--r-- | xkb/xkmread.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xkb/xkmread.c b/xkb/xkmread.c index dc6e0d252..ff0537e10 100644 --- a/xkb/xkmread.c +++ b/xkb/xkmread.c @@ -457,8 +457,7 @@ XkbAction *act; act->mods.flags = wire.actionData[0]; act->mods.mask = wire.actionData[1]; act->mods.real_mods = wire.actionData[2]; - act->mods.vmods1 = wire.actionData[3]; - act->mods.vmods2 = wire.actionData[4]; + act->mods.vmods = (wire.actionData[3] << 8) | wire.actionData[4]; break; case XkbSA_SetGroup: case XkbSA_LatchGroup: @@ -497,8 +496,7 @@ XkbAction *act; act->iso.real_mods = wire.actionData[2]; act->iso.group_XXX = wire.actionData[3]; act->iso.affect = wire.actionData[4]; - act->iso.vmods1 = wire.actionData[5]; - act->iso.vmods2 = wire.actionData[6]; + act->iso.vmods = (wire.actionData[5] << 8) | wire.actionData[6]; break; case XkbSA_SwitchScreen: act->screen.flags = wire.actionData[0]; |