xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 249c892784ca5e8c75863dd82097ca2bedec4723
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.

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