From: Stéphane Marchesin <marcheu@chromium.org>
Date: Fri, 25 May 2012 00:58:53 +0000 (-0700)
Subject: glx: Handle a null reply in QueryVersion.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0256edd709d976198d5354fdd88143d8da9e51d5;p=mesa.git

glx: Handle a null reply in QueryVersion.

Works around crashes when X connections break.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

NOTE: This is a candidate for the 8.0 branch.
---

diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 12fff22399d..a4e76c1c398 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -293,6 +293,9 @@ QueryVersion(Display * dpy, int opcode, int *major, int *minor)
                                                                        GLX_MINOR_VERSION),
                                                                       NULL);
 
+   if (!reply)
+     return GL_FALSE;
+
    if (reply->major_version != GLX_MAJOR_VERSION) {
       free(reply);
       return GL_FALSE;