[Mesa-dev] [PATCH v2] glx: fix crash with bad fbconfig

[Tapani Pälli]

ping

On 05/31/2016 12:53 PM, Tapani Pälli wrote:
> From: Daniel Czarnowski <daniel.czarnowski at intel.com>
>
> GLX documentation states:
> 	glXCreateNewContext can generate the following errors: (...)
> 	GLXBadFBConfig if config is not a valid GLXFBConfig
>
> Function checks if the given config is a valid config and sets proper
> error code.
>
> Fixes currently crashing glx-fbconfig-bad Piglit test.
>
> v2: coding style cleanups (Emil, Topi)
>     use DefaultScreen macro (Emil)
>
> Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
> Cc: "11.2" <mesa-stable at lists.freedesktop.org>
> ---
>  src/glx/glxcmds.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
> index 5dce982..ebb8bc6 100644
> --- a/src/glx/glxcmds.c
> +++ b/src/glx/glxcmds.c
> @@ -1630,6 +1630,29 @@ glXCreateNewContext(Display * dpy, GLXFBConfig fbconfig,
>                      int renderType, GLXContext shareList, Bool allowDirect)
>  {
>     struct glx_config *config = (struct glx_config *) fbconfig;
> +   int screen = DefaultScreen(dpy);
> +   struct glx_config **config_list;
> +   int list_size;
> +   unsigned i;
> +
> +   if (!config) {
> +       __glXSendError(dpy, GLXBadFBConfig, 0, X_GLXCreateNewContext, false);
> +       return NULL;
> +   }
> +
> +   config_list = (struct glx_config **)
> +      glXGetFBConfigs(dpy, screen, &list_size);
> +
> +   for (i = 0; i < list_size; i++) {
> +       if (config_list[i] == config)
> +           break;
> +   }
> +   free(config_list);
> +
> +   if (i == list_size) {
> +       __glXSendError(dpy, GLXBadFBConfig, 0, X_GLXCreateNewContext, false);
> +       return NULL;
> +   }
>
>     return CreateContext(dpy, config->fbconfigID, config, shareList,
>  			allowDirect, X_GLXCreateNewContext, renderType,
>