godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Fix shader crash if duplicated struct members created

Browse Source
This commit is contained in:
Yuri Roubinsky
2020-02-15 22:19:45 +03:00
parent 53cf289f30
commit a1da8560ee
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
servers/visual/shader_language.cpp
View File

@@ -5675,7 +5675,7 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
st.shader_struct = st_node; st.shader_struct = st_node;
int member_count = 0; int member_count = 0;
Set<String> member_names;
while (true) { // variables list while (true) { // variables list
tk = _get_token(); tk = _get_token();
if (tk.type == TK_CURLY_BRACKET_CLOSE) { if (tk.type == TK_CURLY_BRACKET_CLOSE) {
@@ -5732,6 +5732,12 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct
member->struct_name = struct_name; member->struct_name = struct_name;
member->name = tk.text; member->name = tk.text;
if (member_names.has(member->name)) {
_set_error("Redefinition of '" + String(member->name) + "'");
return ERR_PARSE_ERROR;
}
member_names.insert(member->name);
tk = _get_token(); tk = _get_token();
if (tk.type == TK_BRACKET_OPEN) { if (tk.type == TK_BRACKET_OPEN) {
tk = _get_token(); tk = _get_token();