Attachment 57777 Details for Bug 41149 – patch for 1.11.3.901

[patch] patch for 1.11.3.901

dix-avoid-NULL-pointer-dereference-on-button-only-devices-38313.patch (text/plain), 1.58 KB, created by Michal Suchanek on 2012-02-28 10:55:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Suchanek

Created: 2012-02-28 10:55:17 UTC

Size: 1.58 KB

patch

obsolete

>Index: xorg-server-1.11.3.901/dix/getevents.c
>===================================================================
>--- xorg-server-1.11.3.901.orig/dix/getevents.c	2012-02-28 17:00:05.000000000 +0100
>+++ xorg-server-1.11.3.901/dix/getevents.c	2012-02-28 17:35:51.000000000 +0100
>@@ -205,13 +205,15 @@
>         if (valuator_mask_isset(mask, i))
>         {
>             SetBit(event->valuators.mask, i);
>-            if (valuator_get_mode(dev, i) == Absolute)
>+            if (!dev->valuator || (dev->valuator->numAxes <= i) ||
>+                (valuator_get_mode(dev, i) == Absolute))
>                 SetBit(event->valuators.mode, i);
>             event->valuators.data[i] = valuator_mask_get(mask, i);
>             event->valuators.data_frac[i] =
>                 dev->last.remainder[i] * (1 << 16) * (1 << 16);
>         }
>-        else if (valuator_get_mode(dev, i) == Absolute)
>+        else if (dev->valuator && (dev->valuator->numAxes > i) &&
>+            (valuator_get_mode(dev, i) == Absolute))
>             event->valuators.data[i] = dev->valuator->axisVal[i];
>     }
> }
>@@ -640,7 +642,7 @@
> {
>     AxisInfoPtr axis;
> 
>-    if (axisNum >= pDev->valuator->numAxes)
>+    if (!pDev->valuator || axisNum >= pDev->valuator->numAxes)
>         return;
> 
>     axis = pDev->valuator->axes + axisNum;
>@@ -1185,7 +1187,8 @@
> 
>     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;
>

Actions: View | Splinter Review

Attachments on bug 41149: 51538 | 52040 | 52041 | 57593 | 57712 | 57777 | 57809 | 57810

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.