diff options
author | Danylo Piliaiev <[email protected]> | 2020-03-11 15:29:12 +0200 |
---|---|---|
committer | Danylo Piliaiev <[email protected]> | 2020-03-13 11:49:06 +0200 |
commit | 1305b932747ff4f8ab0253b12dc979dcbfd6777b (patch) | |
tree | acb06a6915eefd69fd32a050a8e2cf00b7012288 /src/compiler/glsl/glcpp/glcpp-parse.y | |
parent | f8051f77ea00934cc00d9f55f1a737c50037af65 (diff) |
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 <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4146>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4146>
Diffstat (limited to 'src/compiler/glsl/glcpp/glcpp-parse.y')
-rw-r--r-- | src/compiler/glsl/glcpp/glcpp-parse.y | 1 |
1 files changed, 1 insertions, 0 deletions
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; |