From 0c882f4fa991ef379e416628eb41cd2178818ad1 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 14 Aug 2012 16:02:38 +0100 Subject: [PATCH] sna/gen2,3: Prevent dereferencing a NULL bo with solid render fills Signed-off-by: Chris Wilson --- src/sna/gen2_render.c | 2 +- src/sna/gen3_render.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c index 431b972f..153c7ae8 100644 --- a/src/sna/gen2_render.c +++ b/src/sna/gen2_render.c @@ -1775,7 +1775,7 @@ gen2_render_composite(struct sna *sna, case 0: gen2_composite_solid_init(sna, &tmp->src, 0); case 1: - if (mask == NULL && + if (mask == NULL && tmp->src.bo && sna_blt_composite__convert(sna, src_x, src_y, width, height, diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c index ce71d82f..c44359f8 100644 --- a/src/sna/gen3_render.c +++ b/src/sna/gen3_render.c @@ -2858,7 +2858,7 @@ gen3_render_composite(struct sna *sna, tmp->src.u.gen3.type = SHADER_ZERO; break; case 1: - if (mask == NULL && + if (mask == NULL && tmp->src.bo && sna_blt_composite__convert(sna, src_x, src_y, width, height,