OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: check _mesa_hash_table_create return value in link_uniform_blocks

Browse Source 
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Juha-Pekka Heikkila
2014-04-03 17:06:42 +03:00
committed by Ville Syrjälä
parent db081b497e
commit 088da3720f
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/glsl/link_uniform_blocks.cpp
View File

@@ -170,6 +170,12 @@ link_uniform_blocks(void *mem_ctx,
struct hash_table *block_hash = struct hash_table *block_hash =
_mesa_hash_table_create(mem_ctx, _mesa_key_string_equal); _mesa_hash_table_create(mem_ctx, _mesa_key_string_equal);
if (block_hash == NULL) {
_mesa_error_no_memory(__func__);
linker_error(prog, "out of memory\n");
return 0;
}
/* Determine which uniform blocks are active. /* Determine which uniform blocks are active.
*/ */
link_uniform_block_active_visitor v(mem_ctx, block_hash, prog); link_uniform_block_active_visitor v(mem_ctx, block_hash, prog);

2
src/glsl/linker.cpp
View File

@@ -1479,6 +1479,8 @@ link_intrastage_shaders(void *mem_ctx,
const unsigned num_uniform_blocks = const unsigned num_uniform_blocks =
link_uniform_blocks(mem_ctx, prog, shader_list, num_shaders, link_uniform_blocks(mem_ctx, prog, shader_list, num_shaders,
&uniform_blocks); &uniform_blocks);
if (!prog->LinkStatus)
return NULL;
/* Check that there is only a single definition of each function signature /* Check that there is only a single definition of each function signature
* across all shaders. * across all shaders.