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

fixed: saving gdscript with cyclic inheritance crash the editor 

Fix: #9609
(cherry picked from commit c2ab35bdde)
This commit is contained in:
Thakee Nathees 2020-03-19 11:48:46 +05:30 committed by Rémi Verschelde
parent 0200db15cc
commit f3149817ff
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/gdscript/gdscript.cpp
View File

@ -390,10 +390,15 @@ void GDScript::_update_exports_values(Map<StringName, Variant> &values, List<Pro
} }
#endif #endif
bool GDScript::_update_exports() { bool GDScript::_update_exports(bool *r_err, bool p_recursive_call) {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
static Vector<GDScript *> base_caches;
if (!p_recursive_call)
base_caches.clear();
base_caches.push_back(this);
bool changed = false; bool changed = false;
if (source_changed_cache) { if (source_changed_cache) {
@ -487,7 +492,22 @@ bool GDScript::_update_exports() {
placeholder_fallback_enabled = false; placeholder_fallback_enabled = false;
if (base_cache.is_valid() && base_cache->is_valid()) { if (base_cache.is_valid() && base_cache->is_valid()) {
if (base_cache->_update_exports()) { for (int i = 0; i < base_caches.size(); i++) {
if (base_caches[i] == base_cache.ptr()) {
if (r_err)
*r_err = true;
valid = false; // to show error in the editor
base_cache->valid = false;
base_cache->inheriters_cache.clear(); // to prevent future stackoverflows
base_cache.unref();
base.unref();
_base = nullptr;
ERR_FAIL_V_MSG(false, "Cyclic inheritance in script class.");
}
}
if (base_cache->_update_exports(r_err, true)) {
if (r_err && *r_err)
return false;
changed = true; changed = true;
} }
} }
@ -515,7 +535,10 @@ void GDScript::update_exports() {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
_update_exports(); bool cyclic_error = false;
_update_exports(&cyclic_error);
if (cyclic_error)
return;
Set<ObjectID> copy = inheriters_cache; //might get modified Set<ObjectID> copy = inheriters_cache; //might get modified

2
modules/gdscript/gdscript.h
View File

@ -132,7 +132,7 @@ class GDScript : public Script {
#endif #endif
bool _update_exports(); bool _update_exports(bool *r_err = nullptr, bool p_recursive_call = false);
void _save_orphaned_subclasses(); void _save_orphaned_subclasses();