diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-05-10 23:33:52 +0100 | 
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-05-10 23:33:52 +0100 | 
| commit | 1ecd89be039b642affb2f9933f4341d186cb4dea (patch) | |
| tree | 0dddae0bc89c43b8d08b9b16b5dd6cbaa43e57e9 | |
| parent | a8761585ef0b37736d302299d6b03e0957ad3e16 (diff) | |
uxa: Protect against valid SourcePict in uxa_acquire_mask()
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -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;  	} | 
