commit 2d5d1f55983f645df97f0b44ab95235d30faa7bf
author Dave Airlie <airlied@redhat.com> Tue Sep 02 09:54:36 2014 +1000
committer Dave Airlie <airlied@redhat.com> Tue Sep 02 16:05:52 2014 +1000
tree 053f82e986ca004ae25a89d891dcf168ca2c5373
parent 9f2050365851c61f21f83ce60bc628a3e192e1dc

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>

src/glsl/linker.cpp

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index d5473ad..57be493 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -2439,8 +2439,10 @@
          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;
+            }
          }
       }
    }