Mesa (master): gallium: fix TFP on gallium

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 47de9adece49f78c6e4065bedc69ce13272bc120
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=47de9adece49f78c6e4065bedc69ce13272bc120

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon May 31 19:24:50 2010 +1000

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 at redhat.com>

---

 .../state_trackers/dri/common/dri_context.h        |    2 ++
 src/mesa/drivers/dri/common/dri_util.c             |    1 +
 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 54e56c6..b29e853 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 c3d1f2c..18b9035 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;