From 049bb94d2e177f7415e7dddd71907be3e7f153c6 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 24 May 2016 10:10:40 -0700 Subject: [PATCH] mesa: Fix bogus strncmp MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The string "[0]\0" is the same as "[0]" as far as the C string datatype is concerned. That string has length 3. strncmp(s, length_3_string, 4) is the same as strcmp(s, length_3_string), so make it be strcmp. v2: Not the same as strncmp(..., 3). Noticed by Ilia. Signed-off-by: Ian Romanick Reviewed-by: Ilia Mirkin Reviewed-by: Kenneth Graunke Reviewed-by: Samuel Iglesias Gonsálvez Cc: "12.0" --- 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 28d8147efe0..eec933c2176 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -505,7 +505,7 @@ _mesa_program_resource_find_name(struct gl_shader_program *shProg, if (rname_last_square_bracket) { baselen_without_array_index -= strlen(rname_last_square_bracket); rname_has_array_index_zero = - (strncmp(rname_last_square_bracket, "[0]\0", 4) == 0) && + (strcmp(rname_last_square_bracket, "[0]") == 0) && (baselen_without_array_index == strlen(name)); } -- 2.30.2