xserver: Branch 'server-1.5-branch'

[Julien Cristau]

 dix/getevents.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ca659813a81074cae55ffec51f923c658480b618
Author: Julien Cristau <jcristau at debian.org>
Date:   Wed Oct 8 19:46:50 2008 +0200

    Fix GKVE with key_code > 255
    
    Move the keycode validation checks before use.

diff --git a/dix/getevents.c b/dix/getevents.c
index fbead11..1e0edbf 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -411,9 +411,6 @@ GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
     KeySym sym;
     deviceKeyButtonPointer *kbp = NULL;
 
-    sym = map[(key_code - pDev->key->curKeySyms.minKeyCode)
-              * pDev->key->curKeySyms.mapWidth];
-
     if (!events)
         return 0;
 
@@ -428,6 +425,9 @@ GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type,
     if (key_code < 8 || key_code > 255)
         return 0;
 
+    sym = map[(key_code - pDev->key->curKeySyms.minKeyCode)
+              * pDev->key->curKeySyms.mapWidth];
+
     if (pDev->coreEvents)
         numEvents = 2;
     else