From: Brian Paul <brianp@vmware.com>
Date: Tue, 30 Jun 2009 14:27:28 +0000 (-0600)
Subject: glx: fix null pointer dereference segfault (bug 22546)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=52f895df518608321873f53d6f8549bdbaf0059a;p=mesa.git

glx: fix null pointer dereference segfault (bug 22546)
---

diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index 77471b8599c..820d8b98685 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;
 }