xserver: Branch 'server-1.7-branch'

[Julien Cristau]

 glx/glxcmds.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 01bc98e313b8ee62c506d0f8f408d54b71d1dfa6
Author: Julien Cristau <jcristau at debian.org>
Date:   Sat Jul 3 19:42:26 2010 +0100

    glx: make sure screen is non-negative in validGlxScreen
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    (cherry picked from commit 3f0d3f4d97bce75c1828635c322b6560a45a037f)

diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index b1061a8..3eae1aa 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -58,7 +58,7 @@ validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err)
     /*
     ** Check if screen exists.
     */
-    if (screen >= screenInfo.numScreens) {
+    if (screen < 0 || screen >= screenInfo.numScreens) {
 	client->errorValue = screen;
 	*err = BadValue;
 	return FALSE;