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

Fix shader crash when the comma used in for loop as a trailing

Browse Source
This commit is contained in:
Chaosus
2024-08-10 11:07:53 +03:00
parent c73ac74c4a
commit d74749fd60
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
servers/rendering/shader_language.cpp
View File

@@ -898,6 +898,13 @@ bool ShaderLanguage::_lookup_next(Token &r_tk) {
return false; return false;
} }
ShaderLanguage::Token ShaderLanguage::_peek() {
TkPos pre_pos = _get_tkpos();
Token tk = _get_token();
_set_tkpos(pre_pos);
return tk;
}
String ShaderLanguage::token_debug(const String &p_code) { String ShaderLanguage::token_debug(const String &p_code) {
clear(); clear();
@@ -8080,6 +8087,11 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
_set_error(RTR("The middle expression is expected to be a boolean operator.")); _set_error(RTR("The middle expression is expected to be a boolean operator."));
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
tk = _peek();
if (tk.type == TK_SEMICOLON) {
_set_error(vformat(RTR("Expected expression, found: '%s'."), get_token_text(tk)));
return ERR_PARSE_ERROR;
}
continue; continue;
} }
if (tk.type != TK_SEMICOLON) { if (tk.type != TK_SEMICOLON) {
@@ -8088,6 +8100,11 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
} }
} else if (p_block->block_type == BlockNode::BLOCK_TYPE_FOR_EXPRESSION) { } else if (p_block->block_type == BlockNode::BLOCK_TYPE_FOR_EXPRESSION) {
if (tk.type == TK_COMMA) { if (tk.type == TK_COMMA) {
tk = _peek();
if (tk.type == TK_PARENTHESIS_CLOSE) {
_set_error(vformat(RTR("Expected expression, found: '%s'."), get_token_text(tk)));
return ERR_PARSE_ERROR;
}
continue; continue;
} }
if (tk.type != TK_PARENTHESIS_CLOSE) { if (tk.type != TK_PARENTHESIS_CLOSE) {

1
servers/rendering/shader_language.h
View File

@@ -1037,6 +1037,7 @@ private:
Token _make_token(TokenType p_type, const StringName &p_text = StringName()); Token _make_token(TokenType p_type, const StringName &p_text = StringName());
Token _get_token(); Token _get_token();
bool _lookup_next(Token &r_tk); bool _lookup_next(Token &r_tk);
Token _peek();
ShaderNode *shader = nullptr; ShaderNode *shader = nullptr;