andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid crash on button events on device without valuators. 

Backport of 2416ee4a01.

Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Michal Suchanek 2012-02-29 14:43:16 +01:00 committed by Peter Hutterer
parent db9620c022
commit 240cd0675b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dix/getevents.c
View File

@ -198,9 +198,11 @@ set_valuators(DeviceIntPtr dev, DeviceEvent* event, ValuatorMask *mask)
{
int i;
if (!dev->valuator)
return;
/* Set the data to the previous value for unset absolute axes. The values
* may be used when sent as part of an XI 1.x valuator event. */
for (i = 0; i < valuator_mask_size(mask); i++)
for (i = 0; (i < valuator_mask_size(mask)) && (i < dev->valuator->numAxes); i++)
{
if (valuator_mask_isset(mask, i))
{
@ -640,7 +642,7 @@ clipAxis(DeviceIntPtr pDev, int axisNum, int *val)
{
AxisInfoPtr axis;
if (axisNum >= pDev->valuator->numAxes)
if (!pDev->valuator || axisNum >= pDev->valuator->numAxes)
return;
axis = pDev->valuator->axes + axisNum;
@ -1185,7 +1187,8 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type, int buttons
if (flags & POINTER_ABSOLUTE)
{
if (flags & POINTER_SCREEN) /* valuators are in screen coords */
if ((flags & POINTER_SCREEN) && /* valuators are in screen coords */
pDev->valuator && (pDev->valuator->numAxes >= 2))
{
int scaled;