From: Samuel Iglesias Gonsalvez Date: Tue, 27 Oct 2015 13:21:12 +0000 (+0100) Subject: main: fix basename match's check if it's an array or struct X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b8cc375851286e0da59fd0afde28c67b3bcabf1;p=mesa.git main: fix basename match's check if it's an array or struct Commit 4565b6f did not update the basename match's check for the case that string would exactly match the name of the variable if the suffix "[0]" were appended to it. Fixes two dEQP-GLES31 tests: dEQP-GLES31.functional.program_interface_query.shader_storage_block.resource_list.block_array dEQP-GLES31.functional.program_interface_query.shader_storage_block.resource_list.block_array_single_element v2: - Change the position of rname_has_array_index_zero to avoid an out-of-bounds read. Reported by Tapani Pälli. Signed-off-by: Samuel Iglesias Gonsalvez Reviewed-by: Tapani Pälli --- diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index 59ec3d7f693..fc0276fafaa 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -590,7 +590,8 @@ _mesa_program_resource_find_name(struct gl_shader_program *shProg, case GL_UNIFORM_BLOCK: case GL_SHADER_STORAGE_BLOCK: /* Basename match, check if array or struct. */ - if (name[baselen] == '\0' || + if (rname_has_array_index_zero || + name[baselen] == '\0' || name[baselen] == '[' || name[baselen] == '.') { return res;