xf86-video-intel: src/sna/sna_accel.c

[Chris Wilson]

 src/sna/sna_accel.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 297f7680cfd73ab6eb099adca7aefe00e61c9e85
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Nov 19 16:11:42 2011 +0000

    sna: Avoid the NULL damage deref
    
    Fixes x11perf -wdcircle100 -time 1 -repeat 1 -rop GXxor
    
    Reported-by: Fryderyk Dziarmagowski <fdziarmagowski at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43084
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 46992f6..69e286b 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -7940,7 +7940,8 @@ sna_push_pixels_solid_blt(GCPtr gc,
 	RegionTranslate(region, dx, dy);
 
 	assert_pixmap_contains_box(pixmap, RegionExtents(region));
-	sna_damage_add(damage, region);
+	if (damage)
+		sna_damage_add(damage, region);
 
 	DBG(("%s: upload(%d, %d, %d, %d)\n", __FUNCTION__,
 	     region->extents.x1, region->extents.y1,