xserver: Branch 'server-1.5-branch'

[Adam Jackson]

 XTrap/xtrapdi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7351c07ae89986bde8053afd8cdcc6a390fd93d5
Author: Roland Bär <roland at verifysoft.de>
Date:   Tue Jun 24 14:13:02 2008 -0400

    Bug #11857: Avoid running off the end of a MAXCLIENTS-sized array.
    (cherry picked from commit 249c892784ca5e8c75863dd82097ca2bedec4723)

diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c
index 7dd9584..55c28a8 100644
--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@@ -486,7 +486,7 @@ int XETrapCreateEnv(ClientPtr client)
     XETrapEnv *penv = NULL;
     int status = Success;
 
-    if (client->index > MAXCLIENTS)
+    if (client->index >= MAXCLIENTS)
     {
         status = BadImplementation;
     }