xserver: Branch 'master'

[Daniel Stone]

 dix/getevents.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
diff-tree 0e800ca4651a947ccef239e6fe7bf64aab92257c (from e1860f241b7322c54c109cf5727df45b54b73916)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Sun Sep 23 12:43:31 2007 +0300

    GetKeyboardEvents: Reject out-of-range keycodes (bug #12528)
    
    We can only deal with keycodes between 8 and 255, so make sure that we never
    accept anything out of this range.

diff --git a/dix/getevents.c b/dix/getevents.c
index 738bd36..a6e246a 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -402,6 +402,7 @@ GetKeyboardValuatorEvents(xEvent *events
     if (!events)
         return 0;
 
+    /* DO NOT WANT */
     if (type != KeyPress && type != KeyRelease)
         return 0;
 
@@ -409,6 +410,9 @@ GetKeyboardValuatorEvents(xEvent *events
         (pDev->coreEvents && !inputInfo.keyboard->key))
         return 0;
 
+    if (key_code < 8 || key_code > 255)
+        return 0;
+
     if (pDev->coreEvents)
         numEvents = 2;
     else