From: nobled <nobled@dreamwidth.org>
Date: Tue, 7 Sep 2010 16:26:07 +0000 (-0400)
Subject: dri: Make it a little clearer that we're not dereferencing a NULL pointer
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6561a64a69c0f5005d03ea297f9a309f48449731;p=mesa.git

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

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 5f079867739..f07c3da4bb6 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;