summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-05-31 19:24:50 +1000
committerDave Airlie <airlied@redhat.com>2010-05-31 19:28:08 +1000
commit47de9adece49f78c6e4065bedc69ce13272bc120 (patch)
treeb8068f4a6659cae3f30330a401178bd58414e9ab
parent7ede18abac601a9cdb7be863415ee3050c591c64 (diff)
gallium: fix TFP on gallium
This fixes an uninitialised value use in the dri2 st when doing TFP. It uses the driContextPriv which isn't initialised at alloc time. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/gallium/state_trackers/dri/common/dri_context.h2
-rw-r--r--src/mesa/drivers/dri/common/dri_util.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/dri/common/dri_context.h b/src/gallium/state_trackers/dri/common/dri_context.h
index 54e56c64998..b29e8533837 100644
--- a/src/gallium/state_trackers/dri/common/dri_context.h
+++ b/src/gallium/state_trackers/dri/common/dri_context.h
@@ -65,6 +65,8 @@ struct dri_context
static INLINE struct dri_context *
dri_context(__DRIcontext * driContextPriv)
{
+ if (!driContextPriv)
+ return NULL;
return (struct dri_context *)driContextPriv->driverPrivate;
}
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index c3d1f2c4542..18b9035248f 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -423,6 +423,7 @@ driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,
return NULL;
}
+ pdp->driContextPriv = NULL;
pdp->loaderPrivate = data;
pdp->hHWDrawable = hwDrawable;
pdp->refcount = 1;