diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-23 11:37:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-23 11:37:53 +0100 |
| commit | 6b131b7d4b02c2635165aeedf593920c43e70740 (patch) | |
| tree | 53f74a8f55acdec2e937bef24d02ae882edb5c6a /core/math/bvh_structs.inc | |
| parent | 293eaa22c8f311829d62d10f6a56184934f3f417 (diff) | |
| parent | 109d08c84ae72c74b48471efd8581ab740b27888 (diff) | |
Merge pull request #59437 from lawnjelly/bvh_check_invalid_handles
Diffstat (limited to 'core/math/bvh_structs.inc')
| -rw-r--r-- | core/math/bvh_structs.inc | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/core/math/bvh_structs.inc b/core/math/bvh_structs.inc index b0d9ae3615..58c8f0479a 100644 --- a/core/math/bvh_structs.inc +++ b/core/math/bvh_structs.inc @@ -60,11 +60,23 @@ private: public: // accessors - BVHABB_CLASS &get_aabb(uint32_t p_id) { return aabbs[p_id]; } - const BVHABB_CLASS &get_aabb(uint32_t p_id) const { return aabbs[p_id]; } + BVHABB_CLASS &get_aabb(uint32_t p_id) { + BVH_ASSERT(p_id < MAX_ITEMS); + return aabbs[p_id]; + } + const BVHABB_CLASS &get_aabb(uint32_t p_id) const { + BVH_ASSERT(p_id < MAX_ITEMS); + return aabbs[p_id]; + } - uint32_t &get_item_ref_id(uint32_t p_id) { return item_ref_ids[p_id]; } - const uint32_t &get_item_ref_id(uint32_t p_id) const { return item_ref_ids[p_id]; } + uint32_t &get_item_ref_id(uint32_t p_id) { + BVH_ASSERT(p_id < MAX_ITEMS); + return item_ref_ids[p_id]; + } + const uint32_t &get_item_ref_id(uint32_t p_id) const { + BVH_ASSERT(p_id < MAX_ITEMS); + return item_ref_ids[p_id]; + } bool is_dirty() const { return dirty; } void set_dirty(bool p) { dirty = p; } |