From cf5667108b2cdd6f37e1a561c18fb5c757258f06 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Sun, 2 Aug 2015 11:40:26 +1000 Subject: [PATCH] mesa: fix type for array indexing validation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit parse_program_resource_name returns -1 when the index is invalid this needs to be tested before assigning the value to the unsigned array_index. In link_varyings.cpp (the other place parse_program_resource_name is used) after the -1 check is done the value is just assigned to an unsigned variable so it seems long is just used so we can return the -1 rather than actually expecting index values to be ridiculously large. Reviewed-by: Matt Turner Reviewed-by: Tapani Pälli --- src/mesa/main/shader_query.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index b49fd38d64d..a85e4c42ae3 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -506,7 +506,7 @@ _mesa_program_resource_array_size(struct gl_program_resource *res) static bool valid_array_index(const GLchar *name, unsigned *array_index) { - unsigned idx = 0; + long idx = 0; const GLchar *out_base_name_end; idx = parse_program_resource_name(name, &out_base_name_end); -- 2.30.2