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

Fix shader crash if non-boolean expression inserted into "if"

Browse Source
This commit is contained in:
Yuri Roubinsky
2019-10-28 08:35:33 +03:00
parent 816341af25
commit ef6161532d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
servers/visual/shader_language.cpp
View File

@@ -4143,6 +4143,11 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const Map<StringName, Bui
if (!n) if (!n)
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
if (n->get_datatype() != TYPE_BOOL) {
_set_error("Expected boolean expression");
return ERR_PARSE_ERROR;
}
tk = _get_token(); tk = _get_token();
if (tk.type != TK_PARENTHESIS_CLOSE) { if (tk.type != TK_PARENTHESIS_CLOSE) {
_set_error("Expected ')' after expression"); _set_error("Expected ')' after expression");