From c573b501797c600c176da413ef75ee81454ec050 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Thu, 21 Nov 2019 10:05:49 +0100 Subject: [PATCH] glsl: add missing initialization of the location path field This was apparently missed in 67b32190f3c95, which added support for ARB_shading_language_include to #line, including the 'path' field for the location. Fixes crashes in CTS with all drivers as they attempt to access an uninitialized path string during parsing. Fixes: 67b32190f3c95 ("glsl: add ARB_shading_language_include support to #line") Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2132 Reviewed-by: Timothy Arceri Reviewed-by: Jose Maria Casanova --- src/compiler/glsl/glsl_parser_extras.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h index 444a51d..c9d579c 100644 --- a/src/compiler/glsl/glsl_parser_extras.h +++ b/src/compiler/glsl/glsl_parser_extras.h @@ -962,6 +962,7 @@ do { \ (Current).first_column = YYRHSLOC(Rhs, 1).first_column; \ (Current).last_line = YYRHSLOC(Rhs, N).last_line; \ (Current).last_column = YYRHSLOC(Rhs, N).last_column; \ + (Current).path = YYRHSLOC(Rhs, N).path; \ } \ else \ { \ @@ -969,6 +970,7 @@ do { \ YYRHSLOC(Rhs, 0).last_line; \ (Current).first_column = (Current).last_column = \ YYRHSLOC(Rhs, 0).last_column; \ + (Current).path = YYRHSLOC(Rhs, 0).path; \ } \ (Current).source = 0; \ } while (0) -- 2.7.4