diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-05-10 23:33:52 +0100 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-05-17 20:20:29 +0100 |
| commit | 27e17daf65b63f72294509e5f074d5cd6325b466 (patch) | |
| tree | 216bef8c37b01151c12bb783538874fbfded21dd /uxa/uxa-render.c | |
| parent | 9d3588c026953da8f50b3daa97cc7a416bfa60a7 (diff) | |
uxa: Protect against valid SourcePict in uxa_acquire_mask()
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 1ecd89be039b642affb2f9933f4341d186cb4dea)
Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
Diffstat (limited to 'uxa/uxa-render.c')
| -rw-r--r-- | uxa/uxa-render.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c index 849a6463..e0581b07 100644 --- a/uxa/uxa-render.c +++ b/uxa/uxa-render.c @@ -740,8 +740,13 @@ uxa_acquire_mask(ScreenPtr pScreen, if (uxa_screen->info->check_composite_texture && uxa_screen->info->check_composite_texture(pScreen, pPict)) { - *out_x = x + pPict->pDrawable->x; - *out_y = y + pPict->pDrawable->y; + if (pPict->pDrawable) { + *out_x = x + pPict->pDrawable->x; + *out_y = y + pPict->pDrawable->y; + } else { + *out_x = x; + *out_y = y; + } return pPict; } |