Browse Source

Merge pull request #12160 from RandomShaper/fix-shader-parse

Fix crash in shader parsing
Rémi Verschelde 7 years ago
parent
commit
bc659323b7
1 changed files with 2 additions and 0 deletions
  1. 2 0
      servers/visual/shader_language.cpp

+ 2 - 0
servers/visual/shader_language.cpp

@@ -2586,6 +2586,8 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
 			} else if (tk.type == TK_BRACKET_OPEN) {
 			} else if (tk.type == TK_BRACKET_OPEN) {
 
 
 				Node *index = _parse_and_reduce_expression(p_block, p_builtin_types);
 				Node *index = _parse_and_reduce_expression(p_block, p_builtin_types);
+				if (!index)
+					return NULL;
 
 
 				if (index->get_datatype() != TYPE_INT && index->get_datatype() != TYPE_UINT) {
 				if (index->get_datatype() != TYPE_INT && index->get_datatype() != TYPE_UINT) {
 					_set_error("Only integer datatypes are allowed for indexing");
 					_set_error("Only integer datatypes are allowed for indexing");