[Mesa-dev] [PATCH] egl: return EGL_BAD_ALLOC if _eglConvertAttribsToInt fails

[Emil Velikov]

On 26/05/15 21:59, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
> 
> This is a fix for the EGL 1.5 patch series.
Can you squash this with the offending patches (12 and 13). Pretty
please :-)

> ---
>  src/egl/main/eglapi.c | 25 +++++++++++++++++++------
>  1 file changed, 19 insertions(+), 6 deletions(-)
> 
> diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
> index 7afc091..3df4968 100644
> --- a/src/egl/main/eglapi.c
> +++ b/src/egl/main/eglapi.c
> @@ -263,13 +263,14 @@ _eglConvertAttribsToInt(const EGLAttrib *attr_list)
>        while (attr_list[size] != EGL_NONE)
>           size += 2;
>  
> -      if (size) {
> -         size += 1; /* add space for EGL_NONE */
> -         int_attribs = malloc(size * sizeof(int_attribs[0]));
> +      size += 1; /* add space for EGL_NONE */
>  
> -         for (i = 0; i < size; i++)
> -            int_attribs[i] = attr_list[i];
> -      }
> +      int_attribs = malloc(size * sizeof(int_attribs[0]));
> +      if (!int_attribs)
> +         return NULL;
> +
> +      for (i = 0; i < size; i++)
> +         int_attribs[i] = attr_list[i];
Set the final value int_attrib[size] to EGL_NONE ?

Thanks
Emil