Mesa (mesa_7_4_branch): glx: added null pointer check in glXGetFBConfigs()

[Brian Paul]

Module: Mesa
Branch: mesa_7_4_branch
Commit: d2f67910629d7f9b00ba127f2e869f02a72306d2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2f67910629d7f9b00ba127f2e869f02a72306d2

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Apr 15 08:02:38 2009 -0600

glx: added null pointer check in glXGetFBConfigs()

Fixes segfault seen with glxinfo with NVIDIA OpenGL.

(cherry picked from master, commit 05471828dc8dd4a184d4467b66e9c08449d1d4c9)

---

 src/glx/x11/glxcmds.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index fc0e593..eb58fda 100644
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -1702,7 +1702,8 @@ PUBLIC GLXFBConfig *glXGetFBConfigs(Display *dpy, int screen, int *nelements)
     int   i;
 
     *nelements = 0;
-    if ( (priv->screenConfigs != NULL)
+    if ( priv
+         && (priv->screenConfigs != NULL)
 	 && (screen >= 0) && (screen <= ScreenCount(dpy))
 	 && (priv->screenConfigs[screen].configs != NULL)
 	 && (priv->screenConfigs[screen].configs->fbconfigID != GLX_DONT_CARE) ) {