From 9a4bd6b45f909dbf65cf66086be2492214c5ac93 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Mon, 18 Jun 2018 11:39:05 +0100
Subject: [PATCH] mesa: add missing return in error path

Fixes: 67f40dadaa6666dacd90 "mesa: add support for ARB_sample_locations"
Cc: Rhys Perry <pendingchaos02@gmail.com>
Cc: Brian Paul <brianp@vmware.com>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.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 5d7e5d29847..fa7a9361dfc 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;
    }
-- 
2.30.2