Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Merge pull request #52063 from KoBeWi/double_comma_of_doom 

Fix crash with consecutive commas in Dictionary
4.0
George Marques 2021-09-10 11:24:51 +07:00 committed by GitHub
parent 6da061faf5 c7452a9940
commit 6423e891a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
Unescape Escape View File

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

2
modules/gdscript/tests/scripts/parser/errors/double_dictionary_comma.gd
Unescape Escape View File

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

2
modules/gdscript/tests/scripts/parser/errors/double_dictionary_comma.out
Unescape Escape View File

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