fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl/ast: don't crash when func_name is NULL

Browse source 
This fixes a crash in
GL43-CTS.shader_subroutine.subroutines_not_allowed_as_variables_constructors_and_argument_or_return_types

If we can't find the func_name in one of these paths,
we have emitted an earlier error so just return here.

Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Cc: "11.2 12.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2016-05-03 14:39:06 +10:00
parent 4336196b7f
commit 6702c15810
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/glsl/ast_function.cpp
View file

@ -2078,6 +2078,10 @@ ast_function_expression::hir(exec_list *instructions,
func_name = id->primary_expression.identifier;
}
/* an error was emitted earlier */
if (!func_name)
return ir_rvalue::error_value(ctx);
ir_function_signature *sig =
match_function_by_name(func_name, &actual_parameters, state);