From 4f6c97b1d78e2ab5857560a5af9b47ed8790978a Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 20 Aug 2010 17:34:23 +0000
Subject: xserver git update 20/8/2010

---
 xorg-server/glx/glxcmds.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'xorg-server/glx/glxcmds.c')

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