aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-30 10:44:01 +0100
committermarha <marha@users.sourceforge.net>2012-01-30 10:44:01 +0100
commit9126bebe40113c6bbe0af98d4dd5fc607b85894e (patch)
tree47034077d8de15d3fa83fed930b7b5f86267961f /xorg-server
parentf774f1e0c95bae5beed78051aaae4fe35b44bf0a (diff)
downloadvcxsrv-9126bebe40113c6bbe0af98d4dd5fc607b85894e.tar.gz
vcxsrv-9126bebe40113c6bbe0af98d4dd5fc607b85894e.tar.bz2
vcxsrv-9126bebe40113c6bbe0af98d4dd5fc607b85894e.zip
glx: added safety against the use of a null pointer
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/glx/glxext.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/glx/glxext.c b/xorg-server/glx/glxext.c
index 42cb274f0..88e109c88 100644
--- a/xorg-server/glx/glxext.c
+++ b/xorg-server/glx/glxext.c
@@ -420,7 +420,7 @@ __GLXcontext *__glXForceCurrent(__GLXclientState *cl, GLXContextTag tag,
if (cx->wait && (*cx->wait)(cx, cl, error))
return NULL;
- if (cx == __glXLastContext) {
+ if (cx == __glXLastContext && GET_DISPATCH()) {
/* No need to re-bind */
return cx;
}