[Mesa-dev] [PATCH 2/6] glx: Handle a null reply in QueryVersion.

Ian Romanick idr at freedesktop.org
Fri May 25 15:21:34 PDT 2012


On 05/24/2012 06:29 PM, Stéphane Marchesin wrote:
> Works around crashes when X connections break.

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

This should also be tagged with:

NOTE: This is a candidate for the 8.0 branch.

> ---
>   src/glx/glxext.c |    3 +++
>   1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/src/glx/glxext.c b/src/glx/glxext.c
> index 12fff22..a4e76c1 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;


More information about the mesa-dev mailing list