diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-10-13 12:54:56 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-10-13 13:59:58 -0700 |
| commit | 2b14e142039193ea854a02706662204f4f5f6db8 (patch) | |
| tree | 58861920529202afa2750803e9e7bd3acd481cd5 | |
| parent | 5b91dfac6fbdf35288a4558638d4923e230ab8d3 (diff) | |
| download | xserver-2b14e142039193ea854a02706662204f4f5f6db8.tar.gz | |
Rootless: src drawable window can now be NULL
Fix a possible crash when pSrc->pDrawable is NULL.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -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 b10ca70eb..c73d5170b 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -257,7 +257,7 @@ RootlessComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, maskWin = (pMask->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pMask->pDrawable : NULL; } - srcWin = (pSrc->pDrawable->type == DRAWABLE_WINDOW) ? + srcWin = (pSrc->pDrawable && pSrc->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pSrc->pDrawable : NULL; dstWin = (pDst->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pDst->pDrawable : NULL; @@ -297,7 +297,7 @@ RootlessGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, GlyphPtr glyph; WindowPtr srcWin, dstWin; - srcWin = (pSrc->pDrawable->type == DRAWABLE_WINDOW) ? + srcWin = (pSrc->pDrawable && pSrc->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pSrc->pDrawable : NULL; dstWin = (pDst->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pDst->pDrawable : NULL; |