xserver/hw/xgl xglpict.c,1.6,1.7

Dave Airlie <xserver-commit-u7BhqnqprCWvj1b/[email protected]> Thu, 22 Dec 2005 17:51:42 -0800 (PST)
Newsgroups gmane.comp.freedesktop.xserver.cvs
Message-ID <[email protected]>
Committed by: airlied

Update of /cvs/xserver/xserver/hw/xgl
In directory gabe:/tmp/cvs-serv16802

Modified Files:
	xglpict.c 
Log Message:
check drawable is available


Index: xglpict.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglpict.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- xglpict.c	13 Jun 2005 16:38:06 -0000	1.6
+++ xglpict.c	23 Dec 2005 01:51:40 -0000	1.7
@@ -69,10 +69,13 @@
     
     pPictureScreen = GetPictureScreen (pScreen);
 
-    if (!xglSyncBits (pSrc->pDrawable, NullBox))
-	FatalError (XGL_SW_FAILURE_STRING);
+    if (pSrc->pDrawable)
+    {
+	if (!xglSyncBits (pSrc->pDrawable, NullBox))
+	    FatalError (XGL_SW_FAILURE_STRING);
+    }
     
-    if (pMask)
+    if (pMask && pMask->pDrawable)
     {
 	if (!xglSyncBits (pMask->pDrawable, NullBox))
 	    FatalError (XGL_SW_FAILURE_STRING);