xf86-video-intel: src/sna/sna_damage.h

[Chris Wilson]

 src/sna/sna_damage.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 21fa92a9ba254527a8661ddde837c7a4c5ff5493
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jan 25 15:37:01 2016 +0000

    sna/damage: Prevent freeing a NULL damage marked as all-damage
    
    After an allocation failure, we may mark a NULL damage pointer as being
    all-damaged. This works on the whole as most places we only ask whether it
    is all or not damaged, and if we do a partial fallback we should just
    then migrate the whole pixmap. However, we tried to destroy the NULL
    damage pointer, and crashed.
    
    Reported-by: Franck Delache <franck.delache at grassvalley.com>
    References: https://bugs.freedesktop.org/show_bug.cgi?id=93720
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_damage.h b/src/sna/sna_damage.h
index 272e83b..3665255 100644
--- a/src/sna/sna_damage.h
+++ b/src/sna/sna_damage.h
@@ -267,7 +267,7 @@ int _sna_damage_get_boxes(struct sna_damage *damage, const BoxRec **boxes);
 static inline int
 sna_damage_get_boxes(struct sna_damage *damage, const BoxRec **boxes)
 {
-	assert(damage);
+	assert(DAMAGE_PTR(damage));
 
 	if (DAMAGE_IS_ALL(damage)) {
 		*boxes = &DAMAGE_PTR(damage)->extents;
@@ -319,7 +319,7 @@ static inline void sna_damage_reduce_all(struct sna_damage **_damage,
 void __sna_damage_destroy(struct sna_damage *damage);
 static inline void sna_damage_destroy(struct sna_damage **damage)
 {
-	if (*damage == NULL)
+	if (DAMAGE_PTR(*damage) == NULL)
 		return;
 
 	__sna_damage_destroy(DAMAGE_PTR(*damage));