summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-08-18 17:39:57 -0700
committerEric Anholt <eric@anholt.net>2010-08-18 17:45:08 -0700
commitf1d5a9419784e939da1a4bcc482567f315da541a (patch)
treec59b94b5fc3b6c5c9c11ee600787da2611329002
parentbd7853768dd7ad52604e3b636ae71dacaa7352fe (diff)
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.
-rw-r--r--src/glsl/linker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index b256574446..2dc569777e 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);