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

Fix crash with consecutive commas in Dictionary

This commit is contained in:
kobewi 2021-08-24 13:19:40 +02:00
parent 1234c2bdd9
commit c7452a9940
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gdscript/gdscript_parser.cpp
View File

@ -2462,8 +2462,10 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_dictionary(ExpressionNode
push_error(R"(Expected "=" after dictionary key.)"); push_error(R"(Expected "=" after dictionary key.)");
} }
} }
key->is_constant = true; if (key != nullptr) {
key->reduced_value = static_cast<IdentifierNode *>(key)->name; key->is_constant = true;
key->reduced_value = static_cast<IdentifierNode *>(key)->name;
}
break; break;
case DictionaryNode::PYTHON_DICT: case DictionaryNode::PYTHON_DICT:
if (!match(GDScriptTokenizer::Token::COLON)) { if (!match(GDScriptTokenizer::Token::COLON)) {

2
modules/gdscript/tests/scripts/parser/errors/double_dictionary_comma.gd Normal file
View File

@ -0,0 +1,2 @@
func test():
var dictionary = { hello = "world",, }

2
modules/gdscript/tests/scripts/parser/errors/double_dictionary_comma.out Normal file
View File

@ -0,0 +1,2 @@
GDTEST_PARSER_ERROR
Expected expression as dictionary key.