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

Brian Paul brianp at kemper.freedesktop.org
Wed Apr 15 14:02:10 UTC 2009


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

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

glx: added null pointer check in glXGetFBConfigs()

Fixes segfault seen with glxinfo with NVIDIA OpenGL.

---

 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 e5c0db4..b9e0706 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) ) {




More information about the mesa-commit mailing list