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

Core: Fix recursion level check for array stringification

This commit is contained in:
Danil Alexeev 2023-07-12 14:59:44 +03:00
parent aa353df8cb
commit bb40bd9aaa
No known key found for this signature in database
GPG Key ID: 124453E157DA8DC7
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/variant/variant.cpp
View File

@ -1754,11 +1754,10 @@ String Variant::stringify(int recursion_count) const {
case COLOR: case COLOR:
return operator Color(); return operator Color();
case DICTIONARY: { case DICTIONARY: {
ERR_FAIL_COND_V_MSG(recursion_count > MAX_RECURSION, "{ ... }", "Maximum dictionary recursion reached!");
recursion_count++;
const Dictionary &d = *reinterpret_cast<const Dictionary *>(_data._mem); const Dictionary &d = *reinterpret_cast<const Dictionary *>(_data._mem);
if (recursion_count > MAX_RECURSION) {
ERR_PRINT("Maximum dictionary recursion reached!");
return "{ ... }";
}
// Add leading and trailing space to Dictionary printing. This distinguishes it // Add leading and trailing space to Dictionary printing. This distinguishes it
// from array printing on fonts that have similar-looking {} and [] characters. // from array printing on fonts that have similar-looking {} and [] characters.
@ -1768,7 +1767,6 @@ String Variant::stringify(int recursion_count) const {
Vector<_VariantStrPair> pairs; Vector<_VariantStrPair> pairs;
recursion_count++;
for (List<Variant>::Element *E = keys.front(); E; E = E->next()) { for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
_VariantStrPair sp; _VariantStrPair sp;
sp.key = stringify_variant_clean(E->get(), recursion_count); sp.key = stringify_variant_clean(E->get(), recursion_count);
@ -1787,6 +1785,7 @@ String Variant::stringify(int recursion_count) const {
return str; return str;
} }
// Packed arrays cannot contain recursive structures, the recursion_count increment is not needed.
case PACKED_VECTOR2_ARRAY: { case PACKED_VECTOR2_ARRAY: {
return stringify_vector(operator Vector<Vector2>(), recursion_count); return stringify_vector(operator Vector<Vector2>(), recursion_count);
} }
@ -1815,13 +1814,10 @@ String Variant::stringify(int recursion_count) const {
return stringify_vector(operator Vector<double>(), recursion_count); return stringify_vector(operator Vector<double>(), recursion_count);
} }
case ARRAY: { case ARRAY: {
Array arr = operator Array(); ERR_FAIL_COND_V_MSG(recursion_count > MAX_RECURSION, "[...]", "Maximum array recursion reached!");
if (recursion_count > MAX_RECURSION) { recursion_count++;
ERR_PRINT("Maximum array recursion reached!");
return "[...]";
}
return stringify_vector(arr, recursion_count); return stringify_vector(operator Array(), recursion_count);
} }
case OBJECT: { case OBJECT: {
if (_get_obj().obj) { if (_get_obj().obj) {