Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash caused by stale owner #78997

Merged
merged 1 commit into from
Dec 8, 2023
Merged

Fix crash caused by stale owner #78997

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions scene/main/node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,11 @@ void Node::_notification(int p_notification) {
_clean_up_owner();
}

while (!data.owned.is_empty()) {
Node *n = data.owned.back()->get();
n->_clean_up_owner(); // This will change data.owned. So it's impossible to loop over the list in the usual manner.
}

if (data.parent) {
data.parent->remove_child(this);
}
Expand Down Expand Up @@ -1415,6 +1420,14 @@ void Node::add_child(Node *p_child, bool p_force_readable_name, InternalMode p_i
ERR_FAIL_COND_MSG(data.blocked > 0, "Parent node is busy setting up children, `add_child()` failed. Consider using `add_child.call_deferred(child)` instead.");

_validate_child_name(p_child, p_force_readable_name);

#ifdef DEBUG_ENABLED
if (p_child->data.owner && !p_child->data.owner->is_ancestor_of(p_child)) {
// Owner of p_child should be ancestor of p_child.
WARN_PRINT(vformat("Adding '%s' as child to '%s' will make owner '%s' inconsistent. Consider unsetting the owner beforehand.", p_child->get_name(), get_name(), p_child->data.owner->get_name()));
}
#endif // DEBUG_ENABLED

_add_child_nocheck(p_child, p_child->data.name, p_internal);
}

Expand Down
Loading