[Mesa-dev] [PATCH 2/2] eg: explicitly size dri2_to_egl_attribute_map[]

Tomasz Figa tfiga at chromium.org
Tue May 2 00:27:28 UTC 2017


Hi Emil,

On Tue, May 2, 2017 at 3:43 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> This way we'll get an implicit zero initialization of the remaining
> members, as required by dri2_add_config().
>
> Fixes: e5efaeb85c3 ("egl: polish dri2_to_egl_attribute_map[]")
> Cc: Tomasz Figa <tfiga at chromium.org>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
> Tomasz, thanks for spotting this!

Thanks for quick response. :)

> ---
>  src/egl/drivers/dri2/egl_dri2.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
> index 91456b025d5..0be7132ac58 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -102,7 +102,7 @@ const __DRIuseInvalidateExtension use_invalidate = {
>     .base = { __DRI_USE_INVALIDATE, 1 }
>  };
>
> -static const EGLint dri2_to_egl_attribute_map[] = {
> +static const EGLint dri2_to_egl_attribute_map[__DRI_ATTRIB_MAX] = {

I believe we still have an off by one here, since __DRI_ATTRIB_MAX is
defined in patch 1/2 with the same value as the last attrib. Also
please see my comment on that one.

Best regards,
Tomasz


More information about the mesa-dev mailing list