瀏覽代碼

Prevent shader crash if name of variable overrides function name

(cherry picked from commit 76324bec8d269330c59812bfcc852a195304aa92)
Yuri Roubinsky 6 年之前
父節點
當前提交
c1cabb0bf5
共有 1 個文件被更改,包括 10 次插入0 次删除
  1. 10 0
      servers/visual/shader_language.cpp

+ 10 - 0
servers/visual/shader_language.cpp

@@ -2848,6 +2848,16 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
 
 				bool ok = _parse_function_arguments(p_block, p_builtin_types, func, &carg);
 
+				// Check if block has a variable with the same name as function to prevent shader crash.
+				ShaderLanguage::BlockNode *bnode = p_block;
+				while (bnode) {
+					if (bnode->variables.has(name)) {
+						_set_error("Expected function name");
+						return NULL;
+					}
+					bnode = bnode->parent_block;
+				}
+
 				//test if function was parsed first
 				for (int i = 0; i < shader->functions.size(); i++) {
 					if (shader->functions[i].name == name) {