diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-23 14:15:19 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-23 14:15:19 +0000 |
| commit | a219a0434f082a1d1faca472c14ba8c8e6d0fbc7 (patch) | |
| tree | 41f0fddb8d4af0b7df7212e195d2b81df2c4acdf /xorg-server/glx/glxcmds.c | |
| parent | a6913ef6cbee338f4f0001be4bde3960ce2cdf00 (diff) | |
| parent | a3f15e28f545a51f0a0139c38944ed324bafb94f (diff) | |
| download | vcxsrv-a219a0434f082a1d1faca472c14ba8c8e6d0fbc7.tar.gz vcxsrv-a219a0434f082a1d1faca472c14ba8c8e6d0fbc7.tar.bz2 vcxsrv-a219a0434f082a1d1faca472c14ba8c8e6d0fbc7.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/glx/glxcmds.c')
| -rw-r--r-- | xorg-server/glx/glxcmds.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c index 35b2c4ee2..c0c1f262b 100644 --- a/xorg-server/glx/glxcmds.c +++ b/xorg-server/glx/glxcmds.c @@ -495,6 +495,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
|