summaryrefslogtreecommitdiffstats
path: root/src/glsl/linker.cpp
diff options
context:
space:
mode:
authorJuha-Pekka Heikkila <[email protected]>2014-04-03 17:06:42 +0300
committerVille Syrjälä <[email protected]>2014-06-26 15:37:14 +0300
commit088da3720f12579c14b1f0edd6e6df6ff8b74571 (patch)
tree3eb581ba4be73e37402d8ac7c635f569129d32eb /src/glsl/linker.cpp
parentdb081b497e42556f9f6d771de104bea948c925b5 (diff)
glsl: check _mesa_hash_table_create return value in link_uniform_blocks
Signed-off-by: Juha-Pekka Heikkila <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/linker.cpp')
-rw-r--r--src/glsl/linker.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 0b6a71679a7..247c828d3d6 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -1479,6 +1479,8 @@ link_intrastage_shaders(void *mem_ctx,
const unsigned num_uniform_blocks =
link_uniform_blocks(mem_ctx, prog, shader_list, num_shaders,
&uniform_blocks);
+ if (!prog->LinkStatus)
+ return NULL;
/* Check that there is only a single definition of each function signature
* across all shaders.