From 45710577f374972946a8eb37833a9c94e5a299bf Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 21 Nov 2011 08:06:12 +0100 Subject: xserver xkeyboard-config mesa git update 21 nov 2011 --- xorg-server/miext/rootless/rootlessScreen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xorg-server/miext') diff --git a/xorg-server/miext/rootless/rootlessScreen.c b/xorg-server/miext/rootless/rootlessScreen.c index 0801e7206..c8557066e 100644 --- a/xorg-server/miext/rootless/rootlessScreen.c +++ b/xorg-server/miext/rootless/rootlessScreen.c @@ -247,8 +247,8 @@ RootlessComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, WindowPtr srcWin, dstWin, maskWin = NULL; if (pMask) { // pMask can be NULL - maskWin = (pMask->pDrawable->type == DRAWABLE_WINDOW) ? - (WindowPtr)pMask->pDrawable : NULL; + maskWin = (pMask->pDrawable && pMask->pDrawable->type == DRAWABLE_WINDOW) ? + (WindowPtr)pMask->pDrawable : NULL; } srcWin = (pSrc->pDrawable && pSrc->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pSrc->pDrawable : NULL; -- cgit v1.2.3