griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Invalid kdtree node allocation after recent refactor

Browse Source 
Address the root cause and fix one definition rule violation.
Broken by fb2ba20b67.

Pull Request: https://projects.blender.org/blender/blender/pulls/137845
This commit is contained in:
Brecht Van Lommel
2025-04-22 14:32:39 +02:00
committed by Brecht Van Lommel
parent 92b748a91b
commit 50023eab75
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenlib/intern/kdtree_impl.h
View File

@@ -22,6 +22,11 @@
#define _BLI_KDTREE_CONCAT(MACRO_ARG1, MACRO_ARG2) _BLI_KDTREE_CONCAT_AUX(MACRO_ARG1, MACRO_ARG2)
#define BLI_kdtree_nd_(id) _BLI_KDTREE_CONCAT(KDTREE_PREFIX_ID, _##id)
/* Put in anonymouse namespace to avoid violating one definition rule.
* Otherwise MEM_malloc_array<KDTreeNode> can get defined once for multiple dimensions,
* with different node sizes. */
namespace {
struct KDTreeNode_head {
uint left, right;
float co[KD_DIMS];
@@ -35,6 +40,8 @@ struct KDTreeNode {
uint d; /* range is only (0..KD_DIMS - 1) */
};
} // namespace
struct KDTree {
KDTreeNode *nodes;
uint nodes_len;
@@ -95,10 +102,6 @@ KDTree *BLI_kdtree_nd_(new)(uint nodes_len_capacity)
KDTree *tree;
tree = MEM_callocN<KDTree>("KDTree");
/* NOTE: Cannot use `MEM_malloc_arrayN<KDTreeNode>()` here, as `KDTreeNode` is not one type, but
* four (1D to 4D), differing by their `float co[KD_DIMS]` member. It seems like the code
* generating the templates does not distinguish these cases, and create a single code for all
* four cases, leading to invalid allocation sizes. */
tree->nodes = MEM_malloc_arrayN<KDTreeNode>(nodes_len_capacity, "KDTreeNode");
tree->nodes_len = 0;
tree->root = KD_NODE_ROOT_IS_INIT;