From 6a4ff51f7a28124f27da52fe8d1a04025ddf7a83 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 16 May 2016 14:49:38 -0700 Subject: [PATCH] glsl: Check that layout is non-null before dereferencing. layout should only be null for structs, but it's checked everywhere else and confuses Coverity (CID 1358495). Reviewed-by: Timothy Arceri --- src/compiler/glsl/ast_to_hir.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index 338edc8..b4c6de2 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -6818,7 +6818,7 @@ ast_process_struct_or_iface_block_members(exec_list *instructions, * the structure may contain a structure that contains ... a matrix * that need the proper layout. */ - if (is_interface && + if (is_interface && layout && (layout->flags.q.uniform || layout->flags.q.buffer) && (field_type->without_array()->is_matrix() || field_type->without_array()->is_record())) { -- 2.7.4