From: Paul Berry Date: Tue, 15 Oct 2013 16:43:22 +0000 (-0700) Subject: glsl: In update_max_array_access, fix interface instance check. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e2d1eaa32a83204646bcccc029fdd31dbaee6d5e;p=mesa.git glsl: In update_max_array_access, fix interface instance check. In commit f878d20 (glsl: Update ir_variable::max_ifc_array_access properly), I accidentally used the wrong kind of check to determine whether the variable being accessed was an interface instance (I used var->get_interface_type() != NULL when I should have used var->is_interface_instance()). As a result, if an unnamed interface block contained a struct which contained an array, update_max_array_access() would mistakenly interpret the struct as a named interface block and try to dereference a null var->max_ifc_array_access. This patch corrects the check, fixing the null dereference. Fixes piglit test interface-block-struct-nesting. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70368 Reviewed-by: Matt Turner --- diff --git a/src/glsl/ast_array_index.cpp b/src/glsl/ast_array_index.cpp index da96cc10ea9..b457ec8997e 100644 --- a/src/glsl/ast_array_index.cpp +++ b/src/glsl/ast_array_index.cpp @@ -69,9 +69,9 @@ update_max_array_access(ir_rvalue *ir, unsigned idx, YYLTYPE *loc, } if (deref_var != NULL) { - const glsl_type *interface_type = - deref_var->var->get_interface_type(); - if (interface_type != NULL) { + if (deref_var->var->is_interface_instance()) { + const glsl_type *interface_type = + deref_var->var->get_interface_type(); unsigned field_index = deref_record->record->type->field_index(deref_record->field); assert(field_index < interface_type->length);