From dbc542b9d38ff9781efcdf1d5308e97f04499138 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 31 Dec 2010 23:29:05 +0000
Subject: dri: Protect against using dri with an non-gem pixmap

Reported-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/intel_dri.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intel_dri.c b/src/intel_dri.c
index dcd3a1ac7..f404ea40b 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)
-- 
cgit v1.2.3