From: Eric Anholt <eric@anholt.net>
Date: Thu, 19 Aug 2010 00:39:57 +0000 (-0700)
Subject: glsl: Also strdup the names of uniform list entries for >vec4 types.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f1d5a9419784e939da1a4bcc482567f315da541a;p=mesa.git

glsl: Also strdup the names of uniform list entries for >vec4 types.

Fixes double-free since the fix to free all of the uniform list.
---

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index b2565744462..2dc569777e7 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -843,7 +843,7 @@ assign_uniform_locations(struct gl_shader_program *prog)
 
 	    n->u[0].Name = strdup(var->name);
 	    for (unsigned j = 1; j < vec4_slots; j++)
-	       n->u[j].Name = n->u[0].Name;
+	       n->u[j].Name = strdup(var->name);
 
 	    hash_table_insert(ht, n, n->u[0].Name);
 	    uniforms.push_tail(& n->link);