diff options
| author | Brian Paul <brianp@vmware.com> | 2009-04-15 08:02:38 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-04-15 08:02:38 -0600 |
| commit | d2f67910629d7f9b00ba127f2e869f02a72306d2 (patch) | |
| tree | 80189e73696ed93de11fc265860042ede3e9c263 | |
| parent | 49e0c74ddd91900fc4effb6d305d56e0563b456d (diff) | |
| download | mesa-d2f67910629d7f9b00ba127f2e869f02a72306d2.tar.gz | |
glx: added null pointer check in glXGetFBConfigs()
Fixes segfault seen with glxinfo with NVIDIA OpenGL.
(cherry picked from master, commit 05471828dc8dd4a184d4467b66e9c08449d1d4c9)
| -rw-r--r-- | 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 fc0e593cb35..eb58fda2d03 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) ) { |