diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-04 09:40:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-04 09:40:31 +0200 |
| commit | 63918271b55923e417b14b9e7add4443582cfab3 (patch) | |
| tree | 59fc1c26991bbdb97d306da11408e98f49e05607 /xorg-server/dix/getevents.c | |
| parent | 7d6bc8457187e6c4284201b3a6625357c4aca9b4 (diff) | |
| parent | 1af6fc1b5d93e54d6674de8b5870448b29f139a7 (diff) | |
| download | vcxsrv-63918271b55923e417b14b9e7add4443582cfab3.tar.gz vcxsrv-63918271b55923e417b14b9e7add4443582cfab3.tar.bz2 vcxsrv-63918271b55923e417b14b9e7add4443582cfab3.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/dix/getevents.c')
| -rw-r--r-- | xorg-server/dix/getevents.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index be369ec72..7242c2c79 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -1636,7 +1636,7 @@ 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) + if ( !pDev->valuator || (i >= pDev->valuator->numAxes)) break; if (!valuator_mask_isset(&mask, i)) |