xf86-video-intel: src/intel_dri.c

[Chris Wilson]

 src/intel_dri.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dbc542b9d38ff9781efcdf1d5308e97f04499138
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Dec 31 23:29:05 2010 +0000

    dri: Protect against using dri with an non-gem pixmap
    
    Reported-by: Jeff Chua <jeff.chua.linux at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_dri.c b/src/intel_dri.c
index dcd3a1a..f404ea4 100644
--- a/src/intel_dri.c
+++ b/src/intel_dri.c
@@ -79,7 +79,7 @@ static uint32_t pixmap_flink(PixmapPtr pixmap)
 	uint32_t name;
 	dri_bo *bo;
 
-	if (priv->bo == NULL)
+	if (priv == NULL || priv->bo == NULL)
 		return 0;
 
 	if (dri_bo_flink(bo, &name) != 0)