diff options
| author | Maxim Kulkin <maxim.kulkin@gmail.com> | 2023-02-17 05:18:58 -0500 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2023-07-14 19:20:04 +0200 |
| commit | 058604f5b845812a8b75a8014a1b243115ad65c7 (patch) | |
| tree | 344b85888cf68a105e6c0fa6c6fed26800c761c1 /scene/resources/resource_format_text.cpp | |
| parent | 0f7625ab46a64b3f5da2b09969ebabf38df9a6e9 (diff) | |
| download | redot-engine-058604f5b845812a8b75a8014a1b243115ad65c7.tar.gz | |
Fix crash when saving resources with circular references
When saving resources, marking of already seen resources was
done too late, causing infinite loop traversing referenced resources
and eventual stack overflow. The change marks traversed resource
before descending to it's children, thus when this resource is
encountered again, it is already marked as seen and traversal stops.
Diffstat (limited to 'scene/resources/resource_format_text.cpp')
| -rw-r--r-- | scene/resources/resource_format_text.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/resources/resource_format_text.cpp b/scene/resources/resource_format_text.cpp index dc0240859e..c02431efa8 100644 --- a/scene/resources/resource_format_text.cpp +++ b/scene/resources/resource_format_text.cpp @@ -1877,6 +1877,8 @@ void ResourceFormatSaverTextInstance::_find_resources(const Variant &p_variant, return; } + resource_set.insert(res); + List<PropertyInfo> property_list; res->get_property_list(&property_list); @@ -1908,8 +1910,7 @@ void ResourceFormatSaverTextInstance::_find_resources(const Variant &p_variant, I = I->next(); } - resource_set.insert(res); //saved after, so the children it needs are available when loaded - saved_resources.push_back(res); + saved_resources.push_back(res); // Saved after, so the children it needs are available when loaded } break; case Variant::ARRAY: { |