aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/getevents.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-05-02 08:46:34 +0200
committermarha <marha@users.sourceforge.net>2012-05-02 08:46:34 +0200
commite67b35e7a899da5805fcce3d390cb10ebcaffe91 (patch)
tree9323222611fb6ee923d9351df9aead4ee342a8f9 /xorg-server/dix/getevents.c
parent762b7fde3d57d3a151f98535fd31516b7e823bc0 (diff)
downloadvcxsrv-e67b35e7a899da5805fcce3d390cb10ebcaffe91.tar.gz
vcxsrv-e67b35e7a899da5805fcce3d390cb10ebcaffe91.tar.bz2
vcxsrv-e67b35e7a899da5805fcce3d390cb10ebcaffe91.zip
fontconfig mesa xserver xkeyboard-config git update 2 May 2012
Diffstat (limited to 'xorg-server/dix/getevents.c')
-rw-r--r--xorg-server/dix/getevents.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index 23bbe065c..c960d4467 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -1598,6 +1598,9 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
/* Now turn the smooth-scrolling axes back into emulated button presses
* for legacy clients, based on the integer delta between before and now */
for (i = 0; i < valuator_mask_size(&mask); i++) {
+ if (i >= pDev->valuator->numAxes)
+ break;
+
if (!valuator_mask_isset(&mask, i))
continue;