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

BVH - fix leaking leaves 

In the BVH leaf nodes are a combination of two objects - a node object, and a leaf object. Testing revealed that in some situations node objects could be freed without also freeing the paired leaf object. This closes this bug.

(cherry picked from commit 90bea27e82)
This commit is contained in:
lawnjelly 2022-02-02 19:35:30 +00:00 committed by Rémi Verschelde
parent 1891c8e172
commit 6c1f158459
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/math/bvh_tree.h
View File

@ -244,7 +244,7 @@ private:
change_root_node(sibling_id, p_tree_id);
// delete the old root node as no longer needed
_nodes.free(p_parent_id);
node_free_node_and_leaf(p_parent_id);
}
return;
@ -257,7 +257,19 @@ private:
}
// put the node on the free list to recycle
_nodes.free(p_parent_id);
node_free_node_and_leaf(p_parent_id);
}
// A node can either be a node, or a node AND a leaf combo.
// Both must be deleted to prevent a leak.
void node_free_node_and_leaf(uint32_t p_node_id) {
TNode &node = _nodes[p_node_id];
if (node.is_leaf()) {
int leaf_id = node.get_leaf_id();
_leaves.free(leaf_id);
}
_nodes.free(p_node_id);
}
void change_root_node(uint32_t p_new_root_id, uint32_t p_tree_id) {
@ -349,7 +361,7 @@ private:
refit_upward(parent_id);
// put the node on the free list to recycle
_nodes.free(owner_node_id);
node_free_node_and_leaf(owner_node_id);
}
// else if no parent, it is the root node. Do not delete