From 1305b932747ff4f8ab0253b12dc979dcbfd6777b Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Wed, 11 Mar 2020 15:29:12 +0200 Subject: [PATCH] glsl: do not crash if string literal is used outside of #include/#line Fixes: 67b32190f3c953c5b7091d76ddeff95c0cbfb439 Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2619 Signed-off-by: Danylo Piliaiev Reviewed-by: Timothy Arceri Tested-by: Marge Bot Part-of: --- src/compiler/glsl/glcpp/glcpp-parse.y | 1 + 1 file changed, 1 insertion(+) diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index 1e57cccc4d1..2a8ea817a98 100644 --- a/src/compiler/glsl/glcpp/glcpp-parse.y +++ b/src/compiler/glsl/glcpp/glcpp-parse.y @@ -1248,6 +1248,7 @@ _token_print(struct _mesa_string_buffer *out, token_t *token) break; case IDENTIFIER: case INTEGER_STRING: + case PATH: case OTHER: _mesa_string_buffer_append(out, token->value.str); break; -- 2.30.2