godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added additional token checks for the shader if..else.. statement. Fixes issue #2791.

Browse Source
This commit is contained in:
hurikhan 2015-11-22 13:49:58 +08:00
parent 265f7ba4e5
commit 49f4ec2b71
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
servers/visual/shader_language.cpp
View File

@ -2340,19 +2340,27 @@ Error ShaderLanguage::parse_flow_if(Parser& parser,Node *p_parent,Node **r_state
parser.advance(); parser.advance();
if (parser.get_token_type()!=TK_CURLY_BRACKET_OPEN) {
parser.set_error("Expected statement block after 'if()'");
return ERR_PARSE_ERROR;
}
Node *substatement=NULL; Node *substatement=NULL;
err = parse_statement(parser,cf,&substatement); err = parse_statement(parser,cf,&substatement);
if (err) if (err)
return err; return err;
cf->statements.push_back(substatement); cf->statements.push_back(substatement);
if (parser.get_token_type()==TK_CF_ELSE) { if (parser.get_token_type()==TK_CF_ELSE) {
parser.advance(); parser.advance();
if (parser.get_token_type()!=TK_CURLY_BRACKET_OPEN) {
parser.set_error("Expected statement block after 'else'");
return ERR_PARSE_ERROR;
}
substatement=NULL; substatement=NULL;
err = parse_statement(parser,cf,&substatement); err = parse_statement(parser,cf,&substatement);
if (err) if (err)