summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-12-31 23:29:05 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2010-12-31 23:29:31 +0000
commitdbc542b9d38ff9781efcdf1d5308e97f04499138 (patch)
treec8e9d9bd69977f9490e989c4c8fb16f5760f87aa
parent53fbc9f1760ee481cba1f6dceb9e7c97282a2976 (diff)
downloadxf86-video-intel-dbc542b9d38ff9781efcdf1d5308e97f04499138.tar.gz
xf86-video-intel-dbc542b9d38ff9781efcdf1d5308e97f04499138.tar.bz2
xf86-video-intel-dbc542b9d38ff9781efcdf1d5308e97f04499138.zip
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>
-rw-r--r--src/intel_dri.c2
1 files changed, 1 insertions, 1 deletions
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)