summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtakahashi42 <dtakahashi42@gmail.com>2011-11-18 11:30:22 -0800
committerJeremy Huddleston <jeremyhu@apple.com>2011-11-18 11:30:22 -0800
commit328074890eeb111950e984c6f618311983600b20 (patch)
treef55d775f222bedf36cca1ca98ca969cde64c1d1b
parent58864146fbdf1820d04825838691e84784ef91bc (diff)
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 <jeremyhu@apple.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--miext/rootless/rootlessScreen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
index 0801e7206..c8557066e 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/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;