aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-08-20 17:34:23 +0000
committermarha <marha@users.sourceforge.net>2010-08-20 17:34:23 +0000
commit4f6c97b1d78e2ab5857560a5af9b47ed8790978a (patch)
tree4c02fe5cec5d893f99edd6ad9bb69a9f975478ca /xorg-server/glx
parent00666832a756014eef48c4f5bd8484cc1299bdf0 (diff)
downloadvcxsrv-4f6c97b1d78e2ab5857560a5af9b47ed8790978a.tar.gz
vcxsrv-4f6c97b1d78e2ab5857560a5af9b47ed8790978a.tar.bz2
vcxsrv-4f6c97b1d78e2ab5857560a5af9b47ed8790978a.zip
xserver git update 20/8/2010
Diffstat (limited to 'xorg-server/glx')
-rw-r--r--xorg-server/glx/glxcmds.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c
index be1f2c659..fb477fa98 100644
--- a/xorg-server/glx/glxcmds.c
+++ b/xorg-server/glx/glxcmds.c
@@ -491,6 +491,13 @@ __glXGetDrawable(__GLXcontext *glxc, GLXDrawable drawId, ClientPtr client,
return pGlxDraw;
}
+ /* No active context and an unknown drawable, bail. */
+ if (glxc == NULL) {
+ client->errorValue = drawId;
+ *error = BadMatch;
+ return NULL;
+ }
+
/* The drawId wasn't a GLX drawable. Make sure it's a window and
* create a GLXWindow for it. Check that the drawable screen
* matches the context screen and that the context fbconfig is