From 571f4396ea7512b792f92d46fb528ba3909641d2 Mon Sep 17 00:00:00 2001 From: Yuri Roubinsky Date: Sun, 21 Feb 2021 13:45:01 +0300 Subject: [PATCH] Prevents shader crash if two struct with the same name are declared --- servers/rendering/shader_language.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers/rendering/shader_language.cpp b/servers/rendering/shader_language.cpp index 1f0cf5959ff..cb98a71e860 100644 --- a/servers/rendering/shader_language.cpp +++ b/servers/rendering/shader_language.cpp @@ -6135,6 +6135,10 @@ Error ShaderLanguage::_parse_shader(const Map &p_funct tk = _get_token(); if (tk.type == TK_IDENTIFIER) { st.name = tk.text; + if (shader->structs.has(st.name)) { + _set_error("Redefinition of '" + String(st.name) + "'"); + return ERR_PARSE_ERROR; + } tk = _get_token(); if (tk.type != TK_CURLY_BRACKET_OPEN) { _set_error("Expected '{'");