summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-06-19 13:36:20 +0100
committerOwain G. Ainsworth <oga@openbsd.org>2010-06-21 13:33:12 +0100
commita8789ee9cc3cb9d217137c99b4ee3186f73da14d (patch)
tree6491015890501a9354e1953dcf2ae6a075070182
parente0d8a49b8710f9b110638ab154af410625eb4f8d (diff)
uxa: Check for allocation failure.
Check for the NULL Picture prior to passing it to the backends for inspection. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit af5c4fc96db56a14bf6347774d8e8f23b38c5967) Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
-rw-r--r--uxa/uxa-render.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index c2c3f68f..ed380e91 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -815,6 +815,9 @@ uxa_acquire_picture(ScreenPtr screen,
dst = uxa_acquire_drawable(screen, src,
x, y, width, height,
out_x, out_y);
+ if (!dst)
+ return 0;
+
if (uxa_screen->info->check_composite_texture &&
!uxa_screen->info->check_composite_texture(screen, dst)) {
if (dst != src)