From 9126bebe40113c6bbe0af98d4dd5fc607b85894e Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 30 Jan 2012 10:44:01 +0100
Subject: glx: added safety against the use of a null pointer

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

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;
     }
-- 
cgit v1.2.3