[Mesa-dev] [PATCH mesa] mesa: add missing return in error path

[Iago Toral]

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>

On Mon, 2018-06-18 at 11:40 +0100, Eric Engestrom wrote:
> Fixes: 67f40dadaa6666dacd90 "mesa: add support for
> ARB_sample_locations"
> Cc: Rhys Perry <pendingchaos02 at gmail.com>
> Cc: Brian Paul <brianp at vmware.com>
> Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
> ---
>  src/mesa/main/fbobject.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
> index 5d7e5d29847dcfdbb23e..fa7a9361dfcfeaa105aa 100644
> --- a/src/mesa/main/fbobject.c
> +++ b/src/mesa/main/fbobject.c
> @@ -4695,9 +4695,11 @@ sample_locations(struct gl_context *ctx,
> struct gl_framebuffer *fb,
>     if (!fb->SampleLocationTable) {
>        size_t size = MAX_SAMPLE_LOCATION_TABLE_SIZE * 2 *
> sizeof(GLfloat);
>        fb->SampleLocationTable = malloc(size);
> -      if (!fb->SampleLocationTable)
> +      if (!fb->SampleLocationTable) {
>           _mesa_error(ctx, GL_OUT_OF_MEMORY,
>                       "Cannot allocate sample location table");
> +         return;
> +      }
>        for (i = 0; i < MAX_SAMPLE_LOCATION_TABLE_SIZE * 2; i++)
>           fb->SampleLocationTable[i] = 0.5f;
>     }