Module: Mesa Branch: mesa_7_4_branch Commit: 32c44fb8d7171f2a4f8168950d6073e9c0b1f45b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=32c44fb8d7171f2a4f8168950d6073e9c0b1f45b
Author: Brian Paul <[email protected]> Date: Tue Jun 30 08:44:57 2009 -0600 glx: fix null pointer dereference segfault (bug 22546) (cherry picked from commit 52f895df518608321873f53d6f8549bdbaf0059a) --- src/glx/x11/glxcmds.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c index eb58fda..73318fb 100644 --- a/src/glx/x11/glxcmds.c +++ b/src/glx/x11/glxcmds.c @@ -164,7 +164,7 @@ GetGLXScreenConfigs(Display *dpy, int scrn) { __GLXdisplayPrivate * const priv = __glXInitialize(dpy); - return (priv->screenConfigs != NULL) ? &priv->screenConfigs[scrn] : NULL; + return (priv && priv->screenConfigs != NULL) ? &priv->screenConfigs[scrn] : NULL; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
