Skip to content

Commit b440fc9

Browse files
daitakahashijeremyhu
authored andcommitted
rootless: Fix a server crash when choosing a color with the gimp color wheel
https://trac.macports.org/ticket/30927 Signed-off-by: Jeremy Huddleston <[email protected]> Reviewed-by: Jeremy Huddleston <[email protected]> (cherry picked from commit 3280748)
1 parent 40c1287 commit b440fc9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

miext/rootless/rootlessScreen.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ RootlessComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
247247
WindowPtr srcWin, dstWin, maskWin = NULL;
248248

249249
if (pMask) { // pMask can be NULL
250-
maskWin = (pMask->pDrawable->type == DRAWABLE_WINDOW) ?
251-
(WindowPtr)pMask->pDrawable : NULL;
250+
maskWin = (pMask->pDrawable && pMask->pDrawable->type == DRAWABLE_WINDOW) ?
251+
(WindowPtr)pMask->pDrawable : NULL;
252252
}
253253
srcWin = (pSrc->pDrawable && pSrc->pDrawable->type == DRAWABLE_WINDOW) ?
254254
(WindowPtr)pSrc->pDrawable : NULL;

0 commit comments

Comments
 (0)