[PATCH] Xi: Remove redundant and incorrect butmap range check

Ben Gamari bgamari.foss at gmail.com
Mon Jun 22 05:59:45 PDT 2009


Maps are CARD8s, therefore checking for values above 255 is completely
unnecessary. Moreover, 0 is a valid value for maps, so the check wasn't
even correct to begin with. This fixes bug #22392, which was uncovered
by commit 280b7f92d729ec910ffa3d18dce7bbc215be7a3c.

Signed-off-by: Ben Gamari <bgamari.foss at gmail.com>
---
 dix/inpututils.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/dix/inpututils.c b/dix/inpututils.c
index 79b6ab7..8194e69 100644
--- a/dix/inpututils.c
+++ b/dix/inpututils.c
@@ -54,12 +54,6 @@ check_butmap_change(DeviceIntPtr dev, CARD8 *map, int len, CARD32 *errval_out,
     for (i = 0; i < len; i++) {
         if (dev->button->map[i + 1] != map[i] && dev->button->down[i + 1])
             return MappingBusy;
-
-        if (map[i] < 1 || map[i] > 255) {
-            if (errval_out)
-                *errval_out = map[i];
-            return -1;
-        }
     }
 
     return Success;
-- 
1.6.3.1




More information about the xorg mailing list