From: Dave Airlie <airlied@redhat.com>
Date: Mon, 1 Sep 2014 23:54:36 +0000 (+1000)
Subject: glsl: free uniform_map on failure path.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2d5d1f55983f645df97f0b44ab95235d30faa7bf;p=mesa.git

glsl: free uniform_map on failure path.

If we fails in reserve_explicit_locations, we leak uniform_map.

Reported-by: coverity scanner.

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index d5473adc36e..57be4931d78 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -2439,8 +2439,10 @@ check_explicit_uniform_locations(struct gl_context *ctx,
          ir_variable *var = node->as_variable();
          if ((var && var->data.mode == ir_var_uniform) &&
              var->data.explicit_location) {
-            if (!reserve_explicit_locations(prog, uniform_map, var))
+            if (!reserve_explicit_locations(prog, uniform_map, var)) {
+               delete uniform_map;
                return;
+            }
          }
       }
    }