godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Fix crash in shader parsing

Browse Source 
...that would happen if incorrect syntax was found just after an opening square bracket.

Fixes #12046.
This commit is contained in:
Pedro J. Estébanez
2017-10-16 21:55:42 +02:00
parent 8de1dc7e9a
commit 7764640f22
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/visual/shader_language.cpp
View File

@@ -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");