xserver: Branch 'master'

Keith Packard keithp at kemper.freedesktop.org
Tue Dec 22 22:01:01 PST 2009


 test/xi2/protocol-eventconvert.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 90e6d93cf9bfafd63d7849dc16ce194d6f9c9d5f
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Dec 23 12:54:14 2009 +1000

    test/xi2: fail if xi2 class type is garbage. (#25492)
    
    If the keycode range exceeds the allowable length, memory gets overwritten.
    Catch this case by making sure that only allowed class types are
    present.
    
    X.Org Bug 25492 <http://bugs.freedesktop.org/show_bug.cgi?id=25492>
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Dave Airlie <airlied at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/test/xi2/protocol-eventconvert.c b/test/xi2/protocol-eventconvert.c
index 66686cb..f20a10a 100644
--- a/test/xi2/protocol-eventconvert.c
+++ b/test/xi2/protocol-eventconvert.c
@@ -736,6 +736,9 @@ static void test_values_XIDeviceChangedEvent(DeviceChangedEvent *in,
 
                 }
                 break;
+            default:
+                g_error("Invalid class type.\n");
+                break;
         }
 
         ptr += any->length * 4;


More information about the xorg-commit mailing list