diff options
author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2020-12-17 12:24:57 +0100 |
---|---|---|
committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2020-12-17 12:24:57 +0100 |
commit | 1b745c7baeddd4589a447549fcdc5630ea767407 (patch) | |
tree | 3c53b001f308f680d250caad918aa140e60b950f /core/variant/variant_parser.cpp | |
parent | f3dccf5891eb4279c57b36123b5f1ba89957a1c1 (diff) | |
download | redot-engine-1b745c7baeddd4589a447549fcdc5630ea767407.tar.gz |
Fix crash parsing a serialized Reference
Diffstat (limited to 'core/variant/variant_parser.cpp')
-rw-r--r-- | core/variant/variant_parser.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/variant/variant_parser.cpp b/core/variant/variant_parser.cpp index 5a0bbf041b..00d81f597a 100644 --- a/core/variant/variant_parser.cpp +++ b/core/variant/variant_parser.cpp @@ -743,6 +743,8 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, return ERR_PARSE_ERROR; } + REF ref = REF(Object::cast_to<Reference>(obj)); + get_token(p_stream, token, line, r_err_str); if (token.type != TK_COMMA) { r_err_str = "Expected ',' after object type"; @@ -767,12 +769,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, } if (token2.type == TK_PARENTHESIS_CLOSE) { - Reference *reference = Object::cast_to<Reference>(obj); - if (reference) { - value = REF(reference); - } else { - value = obj; - } + value = ref.is_valid() ? Variant(ref) : Variant(obj); return OK; } |