From 6dc5ddfe807b307ca10af971c4f84498b2fb82a2 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 4 Jun 2012 13:49:35 +0100 Subject: [PATCH] sna: Remove bogus check for color == 0 This was written when the RGBA color value was being passed around and not the pointer to the xRenderColor. As such, the NULL deref check doesn't gain much and the check for rgba==0 irrelevant in this scenario. Reported-by: Zdenek Kabelac Signed-off-by: Chris Wilson --- src/sna/sna_render.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c index c3c66663..e06e3c26 100644 --- a/src/sna/sna_render.c +++ b/src/sna/sna_render.c @@ -154,10 +154,8 @@ no_render_fill_boxes(struct sna *sna, __FUNCTION__, op, color->red, color->green, color->blue, color->alpha)); - if (color == 0) - op = PictOpClear; - if (op == PictOpClear) { + pixel = 0; alu = GXclear; op = PictOpSrc; } @@ -170,7 +168,8 @@ no_render_fill_boxes(struct sna *sna, if (op != PictOpSrc) return FALSE; - if (!sna_get_pixel_from_rgba(&pixel, + if (alu == GXcopy && + !sna_get_pixel_from_rgba(&pixel, color->red, color->green, color->blue,