projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 14a2b54)
glx: fix null pointer dereference segfault (bug 22546)
authorBrian Paul <brianp@vmware.com>
Tue, 30 Jun 2009 14:27:28 +0000 (08:27 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 30 Jun 2009 14:43:22 +0000 (08:43 -0600)
src/glx/x11/glxcmds.c patch | blob | history

diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index 77471b8599c98b7f578106d65f85cf207d5136d7..820d8b98685e3d9ac4c379b326c5f475f57bbeed 100644 (file)
--- 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;
 }