summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-06-30 08:44:57 -0600
committerBrian Paul <brianp@vmware.com>2009-06-30 08:44:57 -0600
commit32c44fb8d7171f2a4f8168950d6073e9c0b1f45b (patch)
tree0893599e4276c1161c23f095c51d237514827abe
parent908a87043f1386952d4656b79df98c7fc01eaba1 (diff)
glx: fix null pointer dereference segfault (bug 22546)
(cherry picked from commit 52f895df518608321873f53d6f8549bdbaf0059a)
-rw-r--r--src/glx/x11/glxcmds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index eb58fda2d0..73318fbecb 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;
}