summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha-Pekka Heikkila <[email protected]>2016-10-13 13:43:29 +0300
committerMarek Olšák <[email protected]>2016-10-31 11:53:38 +0100
commit6770b17b9994942b4bd39fcdb493c2b0866bceaf (patch)
tree40890b8ec94df6195c2c3aa1b8be308c6c8b4fd4
parentf67c5a7ccd6f4ef9e1c095971a7f432cbcbbb509 (diff)
glsl: Fix reading of uninitialized memory
Switch to use memory allocations which zero memory for places where needed. v2: modify and rebase on top of Marek's series (Tapani) Signed-off-by: Juha-Pekka Heikkila <[email protected]> Signed-off-by: Marek Olšák <[email protected]>
-rw-r--r--src/compiler/glsl/linker.cpp4
-rw-r--r--src/compiler/glsl_types.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 215fcc409f7..03b866f2913 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -4525,8 +4525,8 @@ link_varyings_and_uniforms(unsigned first, unsigned last,
return false;
}
- tfeedback_decls = ralloc_array(mem_ctx, tfeedback_decl,
- num_tfeedback_decls);
+ tfeedback_decls = rzalloc_array(mem_ctx, tfeedback_decl,
+ num_tfeedback_decls);
if (!parse_tfeedback_decls(ctx, prog, mem_ctx, num_tfeedback_decls,
varying_names, tfeedback_decls))
return false;
diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
index 3918c2f16b0..744b457013d 100644
--- a/src/compiler/glsl_types.cpp
+++ b/src/compiler/glsl_types.cpp
@@ -149,8 +149,8 @@ glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields,
init_ralloc_type_ctx();
assert(name != NULL);
this->name = ralloc_strdup(this->mem_ctx, name);
- this->fields.structure = ralloc_array(this->mem_ctx,
- glsl_struct_field, length);
+ this->fields.structure = rzalloc_array(this->mem_ctx,
+ glsl_struct_field, length);
for (i = 0; i < length; i++) {
this->fields.structure[i] = fields[i];
this->fields.structure[i].name = ralloc_strdup(this->fields.structure,