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

Chris Wilson ickle at kemper.freedesktop.org
Fri Nov 13 11:22:27 PST 2015


 src/sna/sna_dri2.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 0340718366d7cb168a46930eb7be22f2d88354d8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Nov 13 19:21:37 2015 +0000

    sna/dri2: Don't try and destroy the NULL pointer
    
    From the previous commit, we have to check for NULL before the
    dereference.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index f4fa081..c093024 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -2527,8 +2527,10 @@ static bool sna_dri2_blit_complete(struct sna_dri2_event *info)
 	}
 
 	DBG(("%s: blit finished\n", __FUNCTION__));
-	kgem_bo_destroy(&info->sna->kgem, info->bo);
-	info->bo = NULL;
+	if (info->bo) {
+		kgem_bo_destroy(&info->sna->kgem, info->bo);
+		info->bo = NULL;
+	}
 	return true;
 }
 


More information about the xorg-commit mailing list