Mesa (master): dri: Make it a little clearer that we' re not dereferencing a NULL pointer

Kristian Høgsberg krh at kemper.freedesktop.org
Tue Sep 7 16:27:53 UTC 2010


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

Author: nobled <nobled at dreamwidth.org>
Date:   Tue Sep  7 12:26:07 2010 -0400

dri: Make it a little clearer that we're not dereferencing a NULL pointer

---

 src/mesa/drivers/dri/common/dri_util.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 5f07986..f07c3da 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -635,6 +635,7 @@ dri2CreateNewContextForAPI(__DRIscreen *screen, int api,
 			   __DRIcontext *shared, void *data)
 {
     __DRIcontext *context;
+    const __GLcontextModes *modes = (config != NULL) ? &config->modes : NULL;
     void *shareCtx = (shared != NULL) ? shared->driverPrivate : NULL;
     gl_api mesa_api;
 
@@ -663,7 +664,7 @@ dri2CreateNewContextForAPI(__DRIscreen *screen, int api,
     context->driDrawablePriv = NULL;
     context->loaderPrivate = data;
     
-    if (!(*screen->DriverAPI.CreateContext)(mesa_api, &config->modes,
+    if (!(*screen->DriverAPI.CreateContext)(mesa_api, modes,
 					    context, shareCtx) ) {
         free(context);
         return NULL;




More information about the mesa-commit mailing list