From: Emil Velikov <emil.velikov@collabora.com>
Date: Fri, 30 Sep 2016 10:01:27 +0000 (+0100)
Subject: glx: return GL_FALSE from glx_screen_init where applicable.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e9e05dfca18c7f09caa40396d6dd4f2b3ddc1d4;p=mesa.git

glx: return GL_FALSE from glx_screen_init where applicable.

Return GL_FALSE if we fail to find any fb/visual configs, otherwise we
end up with all sorts of chaos further down the GLX stack.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index f6bc377add5..9ef7ff5f694 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -748,8 +748,11 @@ glx_screen_init(struct glx_screen *psc,
    psc->dpy = priv->dpy;
    psc->display = priv;
 
-   getVisualConfigs(psc, priv, screen);
-   getFBConfigs(psc, priv, screen);
+   if (!getVisualConfigs(psc, priv, screen))
+      return GL_FALSE;
+
+   if (!getFBConfigs(psc, priv, screen))
+      return GL_FALSE;
 
    return GL_TRUE;
 }