asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash parsing a serialized Reference

Browse source
This commit is contained in:
Pedro J. Estébanez 2020-12-17 12:24:55 +01:00
parent 80c9f2d975
commit 4dafa5b21e
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/variant_parser.cpp
View file

@ -712,6 +712,8 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
REF ref = REF(Object::cast_to<Reference>(obj));
get_token(p_stream, token, line, r_err_str); get_token(p_stream, token, line, r_err_str);
if (token.type != TK_COMMA) { if (token.type != TK_COMMA) {
r_err_str = "Expected ',' after object type"; r_err_str = "Expected ',' after object type";
@ -737,12 +739,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
return err; return err;
if (token2.type == TK_PARENTHESIS_CLOSE) { if (token2.type == TK_PARENTHESIS_CLOSE) {
Reference *reference = Object::cast_to<Reference>(obj); value = ref.is_valid() ? Variant(ref) : Variant(obj);
if (reference) {
value = REF(reference);
} else {
value = obj;
}
return OK; return OK;
} }