Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-02 09:02:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #39386 from akien-mga/variantparser-crash-bad-vectors

Browse Source 
VariantParser: Fix crash on malformed vectors
This commit is contained in:
Rémi Verschelde 2020-06-08 13:13:44 +02:00 committed by GitHub
commit 96f3e33a6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
core/variant_parser.cpp
View File

@ -479,12 +479,6 @@ Error VariantParser::_parse_construct(Stream *p_stream, Vector<T> &r_construct,
} }
Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, int &line, String &r_err_str, ResourceParser *p_res_parser) { Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, int &line, String &r_err_str, ResourceParser *p_res_parser) {
/* {
Error err = get_token(p_stream,token,line,r_err_str);
if (err)
return err;
}*/
if (token.type == TK_CURLY_BRACKET_OPEN) { if (token.type == TK_CURLY_BRACKET_OPEN) {
Dictionary d; Dictionary d;
Error err = _parse_dictionary(d, p_stream, line, r_err_str, p_res_parser); Error err = _parse_dictionary(d, p_stream, line, r_err_str, p_res_parser);
@ -501,7 +495,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = a; value = a;
return OK; return OK;
} else if (token.type == TK_IDENTIFIER) { } else if (token.type == TK_IDENTIFIER) {
String id = token.value; String id = token.value;
if (id == "true") { if (id == "true") {
@ -523,10 +516,10 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 2) { if (args.size() != 2) {
r_err_str = "Expected 2 arguments for constructor"; r_err_str = "Expected 2 arguments for constructor";
return ERR_PARSE_ERROR;
} }
value = Vector2(args[0], args[1]); value = Vector2(args[0], args[1]);
return OK;
} else if (id == "Vector2i") { } else if (id == "Vector2i") {
Vector<int32_t> args; Vector<int32_t> args;
Error err = _parse_construct<int32_t>(p_stream, args, line, r_err_str); Error err = _parse_construct<int32_t>(p_stream, args, line, r_err_str);
@ -536,10 +529,10 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 2) { if (args.size() != 2) {
r_err_str = "Expected 2 arguments for constructor"; r_err_str = "Expected 2 arguments for constructor";
return ERR_PARSE_ERROR;
} }
value = Vector2i(args[0], args[1]); value = Vector2i(args[0], args[1]);
return OK;
} else if (id == "Rect2") { } else if (id == "Rect2") {
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
@ -549,10 +542,10 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 4) { if (args.size() != 4) {
r_err_str = "Expected 4 arguments for constructor"; r_err_str = "Expected 4 arguments for constructor";
return ERR_PARSE_ERROR;
} }
value = Rect2(args[0], args[1], args[2], args[3]); value = Rect2(args[0], args[1], args[2], args[3]);
return OK;
} else if (id == "Rect2i") { } else if (id == "Rect2i") {
Vector<int32_t> args; Vector<int32_t> args;
Error err = _parse_construct<int32_t>(p_stream, args, line, r_err_str); Error err = _parse_construct<int32_t>(p_stream, args, line, r_err_str);
@ -562,10 +555,10 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 4) { if (args.size() != 4) {
r_err_str = "Expected 4 arguments for constructor"; r_err_str = "Expected 4 arguments for constructor";
return ERR_PARSE_ERROR;
} }
value = Rect2i(args[0], args[1], args[2], args[3]); value = Rect2i(args[0], args[1], args[2], args[3]);
return OK;
} else if (id == "Vector3") { } else if (id == "Vector3") {
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
@ -575,10 +568,10 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 3) { if (args.size() != 3) {
r_err_str = "Expected 3 arguments for constructor"; r_err_str = "Expected 3 arguments for constructor";
return ERR_PARSE_ERROR;
} }
value = Vector3(args[0], args[1], args[2]); value = Vector3(args[0], args[1], args[2]);
return OK;
} else if (id == "Vector3i") { } else if (id == "Vector3i") {
Vector<int32_t> args; Vector<int32_t> args;
Error err = _parse_construct<int32_t>(p_stream, args, line, r_err_str); Error err = _parse_construct<int32_t>(p_stream, args, line, r_err_str);
@ -588,12 +581,11 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 3) { if (args.size() != 3) {
r_err_str = "Expected 3 arguments for constructor"; r_err_str = "Expected 3 arguments for constructor";
return ERR_PARSE_ERROR;
} }
value = Vector3i(args[0], args[1], args[2]); value = Vector3i(args[0], args[1], args[2]);
return OK;
} else if (id == "Transform2D" || id == "Matrix32") { //compatibility } else if (id == "Transform2D" || id == "Matrix32") { //compatibility
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
if (err) { if (err) {
@ -602,13 +594,14 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 6) { if (args.size() != 6) {
r_err_str = "Expected 6 arguments for constructor"; r_err_str = "Expected 6 arguments for constructor";
return ERR_PARSE_ERROR;
} }
Transform2D m; Transform2D m;
m[0] = Vector2(args[0], args[1]); m[0] = Vector2(args[0], args[1]);
m[1] = Vector2(args[2], args[3]); m[1] = Vector2(args[2], args[3]);
m[2] = Vector2(args[4], args[5]); m[2] = Vector2(args[4], args[5]);
value = m; value = m;
return OK;
} else if (id == "Plane") { } else if (id == "Plane") {
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
@ -618,10 +611,10 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 4) { if (args.size() != 4) {
r_err_str = "Expected 4 arguments for constructor"; r_err_str = "Expected 4 arguments for constructor";
return ERR_PARSE_ERROR;
} }
value = Plane(args[0], args[1], args[2], args[3]); value = Plane(args[0], args[1], args[2], args[3]);
return OK;
} else if (id == "Quat") { } else if (id == "Quat") {
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
@ -631,11 +624,10 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 4) { if (args.size() != 4) {
r_err_str = "Expected 4 arguments for constructor"; r_err_str = "Expected 4 arguments for constructor";
return ERR_PARSE_ERROR;
} }
value = Quat(args[0], args[1], args[2], args[3]); value = Quat(args[0], args[1], args[2], args[3]);
return OK;
} else if (id == "AABB" || id == "Rect3") { } else if (id == "AABB" || id == "Rect3") {
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
@ -645,13 +637,11 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 6) { if (args.size() != 6) {
r_err_str = "Expected 6 arguments for constructor"; r_err_str = "Expected 6 arguments for constructor";
return ERR_PARSE_ERROR;
} }
value = AABB(Vector3(args[0], args[1], args[2]), Vector3(args[3], args[4], args[5])); value = AABB(Vector3(args[0], args[1], args[2]), Vector3(args[3], args[4], args[5]));
return OK;
} else if (id == "Basis" || id == "Matrix3") { //compatibility } else if (id == "Basis" || id == "Matrix3") { //compatibility
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
if (err) { if (err) {
@ -660,10 +650,10 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 9) { if (args.size() != 9) {
r_err_str = "Expected 9 arguments for constructor"; r_err_str = "Expected 9 arguments for constructor";
return ERR_PARSE_ERROR;
} }
value = Basis(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]); value = Basis(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
return OK;
} else if (id == "Transform") { } else if (id == "Transform") {
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
@ -673,11 +663,10 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 12) { if (args.size() != 12) {
r_err_str = "Expected 12 arguments for constructor"; r_err_str = "Expected 12 arguments for constructor";
return ERR_PARSE_ERROR;
} }
value = Transform(Basis(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]), Vector3(args[9], args[10], args[11])); value = Transform(Basis(args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]), Vector3(args[9], args[10], args[11]));
return OK;
} else if (id == "Color") { } else if (id == "Color") {
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
@ -687,11 +676,10 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
if (args.size() != 4) { if (args.size() != 4) {
r_err_str = "Expected 4 arguments for constructor"; r_err_str = "Expected 4 arguments for constructor";
return ERR_PARSE_ERROR;
} }
value = Color(args[0], args[1], args[2], args[3]); value = Color(args[0], args[1], args[2], args[3]);
return OK;
} else if (id == "NodePath") { } else if (id == "NodePath") {
get_token(p_stream, token, line, r_err_str); get_token(p_stream, token, line, r_err_str);
if (token.type != TK_PARENTHESIS_OPEN) { if (token.type != TK_PARENTHESIS_OPEN) {
@ -712,7 +700,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
r_err_str = "Expected ')'"; r_err_str = "Expected ')'";
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
} else if (id == "RID") { } else if (id == "RID") {
get_token(p_stream, token, line, r_err_str); get_token(p_stream, token, line, r_err_str);
if (token.type != TK_PARENTHESIS_OPEN) { if (token.type != TK_PARENTHESIS_OPEN) {
@ -733,8 +720,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
r_err_str = "Expected ')'"; r_err_str = "Expected ')'";
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
return OK;
} else if (id == "Object") { } else if (id == "Object") {
get_token(p_stream, token, line, r_err_str); get_token(p_stream, token, line, r_err_str);
if (token.type != TK_PARENTHESIS_OPEN) { if (token.type != TK_PARENTHESIS_OPEN) {
@ -834,7 +819,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
at_key = true; at_key = true;
} }
} }
} else if (id == "Resource" || id == "SubResource" || id == "ExtResource") { } else if (id == "Resource" || id == "SubResource" || id == "ExtResource") {
get_token(p_stream, token, line, r_err_str); get_token(p_stream, token, line, r_err_str);
if (token.type != TK_PARENTHESIS_OPEN) { if (token.type != TK_PARENTHESIS_OPEN) {
@ -850,8 +834,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = res; value = res;
return OK;
} else if (p_res_parser && id == "ExtResource" && p_res_parser->ext_func) { } else if (p_res_parser && id == "ExtResource" && p_res_parser->ext_func) {
RES res; RES res;
Error err = p_res_parser->ext_func(p_res_parser->userdata, p_stream, res, line, r_err_str); Error err = p_res_parser->ext_func(p_res_parser->userdata, p_stream, res, line, r_err_str);
@ -860,8 +842,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = res; value = res;
return OK;
} else if (p_res_parser && id == "SubResource" && p_res_parser->sub_func) { } else if (p_res_parser && id == "SubResource" && p_res_parser->sub_func) {
RES res; RES res;
Error err = p_res_parser->sub_func(p_res_parser->userdata, p_stream, res, line, r_err_str); Error err = p_res_parser->sub_func(p_res_parser->userdata, p_stream, res, line, r_err_str);
@ -870,8 +850,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = res; value = res;
return OK;
} else { } else {
get_token(p_stream, token, line, r_err_str); get_token(p_stream, token, line, r_err_str);
if (token.type == TK_STRING) { if (token.type == TK_STRING) {
@ -889,14 +867,11 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = res; value = res;
return OK;
} else { } else {
r_err_str = "Expected string as argument for Resource()."; r_err_str = "Expected string as argument for Resource().";
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
} }
} else if (id == "PackedByteArray" || id == "PoolByteArray" || id == "ByteArray") { } else if (id == "PackedByteArray" || id == "PoolByteArray" || id == "ByteArray") {
Vector<uint8_t> args; Vector<uint8_t> args;
Error err = _parse_construct<uint8_t>(p_stream, args, line, r_err_str); Error err = _parse_construct<uint8_t>(p_stream, args, line, r_err_str);
@ -915,9 +890,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = arr; value = arr;
return OK;
} else if (id == "PackedInt32Array" || id == "PackedIntArray" || id == "PoolIntArray" || id == "IntArray") { } else if (id == "PackedInt32Array" || id == "PackedIntArray" || id == "PoolIntArray" || id == "IntArray") {
Vector<int32_t> args; Vector<int32_t> args;
Error err = _parse_construct<int32_t>(p_stream, args, line, r_err_str); Error err = _parse_construct<int32_t>(p_stream, args, line, r_err_str);
@ -936,9 +908,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = arr; value = arr;
return OK;
} else if (id == "PackedInt64Array") { } else if (id == "PackedInt64Array") {
Vector<int64_t> args; Vector<int64_t> args;
Error err = _parse_construct<int64_t>(p_stream, args, line, r_err_str); Error err = _parse_construct<int64_t>(p_stream, args, line, r_err_str);
@ -957,9 +926,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = arr; value = arr;
return OK;
} else if (id == "PackedFloat32Array" || id == "PackedRealArray" || id == "PoolRealArray" || id == "FloatArray") { } else if (id == "PackedFloat32Array" || id == "PackedRealArray" || id == "PoolRealArray" || id == "FloatArray") {
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
@ -978,8 +944,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = arr; value = arr;
return OK;
} else if (id == "PackedFloat64Array") { } else if (id == "PackedFloat64Array") {
Vector<double> args; Vector<double> args;
Error err = _parse_construct<double>(p_stream, args, line, r_err_str); Error err = _parse_construct<double>(p_stream, args, line, r_err_str);
@ -998,8 +962,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = arr; value = arr;
return OK;
} else if (id == "PackedStringArray" || id == "PoolStringArray" || id == "StringArray") { } else if (id == "PackedStringArray" || id == "PoolStringArray" || id == "StringArray") {
get_token(p_stream, token, line, r_err_str); get_token(p_stream, token, line, r_err_str);
if (token.type != TK_PARENTHESIS_OPEN) { if (token.type != TK_PARENTHESIS_OPEN) {
@ -1046,9 +1008,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = arr; value = arr;
return OK;
} else if (id == "PackedVector2Array" || id == "PoolVector2Array" || id == "Vector2Array") { } else if (id == "PackedVector2Array" || id == "PoolVector2Array" || id == "Vector2Array") {
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
@ -1067,9 +1026,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = arr; value = arr;
return OK;
} else if (id == "PackedVector3Array" || id == "PoolVector3Array" || id == "Vector3Array") { } else if (id == "PackedVector3Array" || id == "PoolVector3Array" || id == "Vector3Array") {
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
@ -1088,9 +1044,6 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = arr; value = arr;
return OK;
} else if (id == "PackedColorArray" || id == "PoolColorArray" || id == "ColorArray") { } else if (id == "PackedColorArray" || id == "PoolColorArray" || id == "ColorArray") {
Vector<float> args; Vector<float> args;
Error err = _parse_construct<float>(p_stream, args, line, r_err_str); Error err = _parse_construct<float>(p_stream, args, line, r_err_str);
@ -1109,15 +1062,13 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
} }
value = arr; value = arr;
return OK;
} else { } else {
r_err_str = "Unexpected identifier: '" + id + "'."; r_err_str = "Unexpected identifier: '" + id + "'.";
return ERR_PARSE_ERROR; return ERR_PARSE_ERROR;
} }
// All above branches end up here unless they had an early return.
return OK; return OK;
} else if (token.type == TK_NUMBER) { } else if (token.type == TK_NUMBER) {
value = token.value; value = token.value;
return OK; return OK;