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

[Chris Wilson]

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

New commits:
commit 3449f1cbe184a618e662d2a662167f05362b82e5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jan 4 02:38:16 2012 +0000

    sna: Guard against NULL damage deref
    
    The fast version of damage checking assumes that the damage has already
    been determined to be non-NULL, so make sure it is.
    
    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 186041f..ab975a9 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1296,7 +1296,9 @@ _sna_drawable_use_cpu_bo(DrawablePtr drawable,
 
 done:
 	*damage = &priv->cpu_damage;
-	if (sna_damage_contains_box__no_reduce(priv->cpu_damage, &extents))
+	if (priv->cpu_damage &&
+	    (priv->cpu_damage->mode == DAMAGE_ALL ||
+	     sna_damage_contains_box__no_reduce(priv->cpu_damage, &extents)))
 		*damage = NULL;
 
 	return TRUE;