xserver: Branch 'server-1.9-branch'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Fri Mar 4 13:51:27 PST 2011
glx/glxcmds.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 457728d723a7d93cd88691dd920bf42a7540616a
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 8d13c15..9e32d6c 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -57,7 +57,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;
More information about the xorg-commit
mailing list