godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-19 14:31:59 +00:00
Code Releases Wiki Activity

SceneTree: Abort change_scene if we're quitting

Browse Source 
Otherwise we can have a segmentation fault if we try to call
`add_child` on an already freed node.

Fixes #35323.
This commit is contained in:
Rémi Verschelde
2020-01-19 22:06:26 +01:00
parent 90a224c6eb
commit 6472e09a85
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scene/main/scene_tree.cpp
View File

@@ -459,10 +459,7 @@ void SceneTree::input_event(const Ref<InputEvent> &p_event) {
} }
void SceneTree::init() { void SceneTree::init() {
//_quit=false;
initialized = true; initialized = true;
root->_set_tree(this); root->_set_tree(this);
MainLoop::init(); MainLoop::init();
} }
@@ -1285,6 +1282,14 @@ void SceneTree::_change_scene(Node *p_to) {
current_scene = NULL; current_scene = NULL;
} }
// If we're quitting, abort.
if (unlikely(_quit)) {
if (p_to) { // Prevent memory leak.
memdelete(p_to);
}
return;
}
if (p_to) { if (p_to) {
current_scene = p_to; current_scene = p_to;
root->add_child(p_to); root->add_child(p_to);
@@ -1292,15 +1297,14 @@ void SceneTree::_change_scene(Node *p_to) {
} }
Error SceneTree::change_scene(const String &p_path) { Error SceneTree::change_scene(const String &p_path) {
Ref<PackedScene> new_scene = ResourceLoader::load(p_path); Ref<PackedScene> new_scene = ResourceLoader::load(p_path);
if (new_scene.is_null()) if (new_scene.is_null())
return ERR_CANT_OPEN; return ERR_CANT_OPEN;
return change_scene_to(new_scene); return change_scene_to(new_scene);
} }
Error SceneTree::change_scene_to(const Ref<PackedScene> &p_scene) {
Error SceneTree::change_scene_to(const Ref<PackedScene> &p_scene) {
Node *new_scene = NULL; Node *new_scene = NULL;
if (p_scene.is_valid()) { if (p_scene.is_valid()) {
new_scene = p_scene->instance(); new_scene = p_scene->instance();
@@ -1310,8 +1314,8 @@ Error SceneTree::change_scene_to(const Ref<PackedScene> &p_scene) {
call_deferred("_change_scene", new_scene); call_deferred("_change_scene", new_scene);
return OK; return OK;
} }
Error SceneTree::reload_current_scene() {
Error SceneTree::reload_current_scene() {
ERR_FAIL_COND_V(!current_scene, ERR_UNCONFIGURED); ERR_FAIL_COND_V(!current_scene, ERR_UNCONFIGURED);
String fname = current_scene->get_filename(); String fname = current_scene->get_filename();
return change_scene(fname); return change_scene(fname);
@@ -1322,6 +1326,7 @@ void SceneTree::add_current_scene(Node *p_current) {
current_scene = p_current; current_scene = p_current;
root->add_child(p_current); root->add_child(p_current);
} }
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
static void _fill_array(Node *p_node, Array &array, int p_level) { static void _fill_array(Node *p_node, Array &array, int p_level) {