diff options
| author | dtakahashi42 <dtakahashi42@gmail.com> | 2011-11-18 11:30:22 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-01-18 11:12:23 -0800 |
| commit | 8f5595070150352a7bc20a55e94c9330a53135f4 (patch) | |
| tree | f9083f19bd4c90e19f1c198840f77c539bbe852a | |
| parent | 615c193a2e56587d77107ba4442561b791c93a9c (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>
(cherry picked from commit 328074890eeb111950e984c6f618311983600b20)
| -rw-r--r-- | miext/rootless/rootlessScreen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 3211c0fe2..40998973a 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; |