From 1ecd89be039b642affb2f9933f4341d186cb4dea Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 10 May 2010 23:33:52 +0100
Subject: [PATCH] uxa: Protect against valid SourcePict in uxa_acquire_mask()

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 uxa/uxa-render.c | 9 +++++++--
 1 file 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;
 	}