From 23fda7c555e6c749b1d9727be5e5571a0559b9b3 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 23 Feb 2010 10:39:20 +0000
Subject: Solved possible crash of accessing a null pointer (happens with
 whitedune when opening a file again)

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

(limited to 'xorg-server')

diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c
index 6c469b8f8..fe1e38cb0 100644
--- a/xorg-server/glx/glxcmds.c
+++ b/xorg-server/glx/glxcmds.c
@@ -503,7 +503,7 @@ __glXGetDrawable(__GLXcontext *glxc, GLXDrawable drawId, ClientPtr client,
 	return NULL;
     }
 
-    if (pDraw->pScreen != glxc->pGlxScreen->pScreen) {
+    if (!glxc || pDraw->pScreen != glxc->pGlxScreen->pScreen) {
 	client->errorValue = pDraw->pScreen->myNum;
 	*error = BadMatch;
 	return NULL;
-- 
cgit v1.2.3