From 8d1ec2ed5a24ed6b29fbffd8fc316e9b5579ea49 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alejandro=20Pi=C3=B1eiro?= Date: Thu, 21 Dec 2017 16:20:18 +0100 Subject: [PATCH] mesa/main: add NULL name check when searching for a resource name Since ARB_gl_spirv name reflection can be missing. piglit shader_runner does several resource checking, so this commit is useful to get even the more simple piglit tests running without crashing on SPIR-V mode. Reviewed-by: Timothy Arceri --- src/mesa/main/shader_query.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index 86064a98b97..11ecd71c575 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -533,6 +533,11 @@ _mesa_program_resource_find_name(struct gl_shader_program *shProg, /* Resource basename. */ const char *rname = _mesa_program_resource_name(res); + + /* Since ARB_gl_spirv lack of name reflections is a possibility */ + if (rname == NULL) + continue; + unsigned baselen = strlen(rname); unsigned baselen_without_array_index = baselen; const char *rname_last_square_bracket = strrchr(rname, '['); -- 2.30.2