diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-12-18 16:09:01 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-12-18 16:09:01 +0000 |
| commit | e0d1211591b1caeff41a5ba6567a052c2c634912 (patch) | |
| tree | 89ddd2fb66727360ab2df03e397054d15501053e /xserver/miext | |
| parent | 47d9c1404905a4c2796c7fbd12a329751e2e3e97 (diff) | |
Bugfix Update to xserver 1.11.3
Diffstat (limited to 'xserver/miext')
| -rw-r--r-- | xserver/miext/rootless/rootlessScreen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xserver/miext/rootless/rootlessScreen.c b/xserver/miext/rootless/rootlessScreen.c index 0801e7206..c8557066e 100644 --- a/xserver/miext/rootless/rootlessScreen.c +++ b/xserver/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; |