Skip to content

Commit

Permalink
Fix crash caused by stale owner
Browse files Browse the repository at this point in the history
Adjust `NOTIFICATION_PREDELETE` in `Node` to clean up owned nodes.
Also print a warning, when the owner becomes invalid.
  • Loading branch information
Sauermann committed Nov 17, 2023
1 parent 80de898 commit d3d00c7
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions scene/main/node.cpp
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

0 comments on commit d3d00c7

Please sign in to comment.