summaryrefslogtreecommitdiff
path: root/xkb/xkmread.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2008-04-25 19:50:12 +0300
committerDaniel Stone <daniel@fooishbar.org>2009-01-22 15:08:57 +1100
commit1bd7fd195d85681e722161f8c636a28f11b40abb (patch)
tree257da15b8ed79a362fda24f1cc7c4986dddd45fe /xkb/xkmread.c
parent61c508fa78aa08ea2666fde950fbafad95d65056 (diff)
XKB: Sanitise pointer actions
Turn 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.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index ff0537e10..9ba14c41f 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -467,10 +467,8 @@ XkbAction *act;
break;
case XkbSA_MovePtr:
act->ptr.flags = wire.actionData[0];
- act->ptr.high_XXX = wire.actionData[1];
- act->ptr.low_XXX = wire.actionData[2];
- act->ptr.high_YYY = wire.actionData[3];
- act->ptr.low_YYY = wire.actionData[4];
+ act->ptr.x = (wire.actionData[1] << 8) | wire.actionData[2];
+ act->ptr.y = (wire.actionData[3] << 8) | wire.actionData[4];
break;
case XkbSA_PtrBtn:
case XkbSA_LockPtrBtn: