Mesa (main): radv: dont call calloc when BVH is empty

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Nov 29 14:05:43 UTC 2021


Module: Mesa
Branch: main
Commit: 57969c6dad21bc0dc1dc1fe2ac834d4f8c086cbd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=57969c6dad21bc0dc1dc1fe2ac834d4f8c086cbd

Author: Filip Gawin <filip.gawin at zoho.com>
Date:   Sat Oct 23 16:59:13 2021 +0200

radv: dont call calloc when BVH is empty

Usage of pointer returned by calloc(0) is UB.

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13503>

---

 src/amd/vulkan/radv_acceleration_structure.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/amd/vulkan/radv_acceleration_structure.c b/src/amd/vulkan/radv_acceleration_structure.c
index 9fe27961d18..c53bef4b807 100644
--- a/src/amd/vulkan/radv_acceleration_structure.c
+++ b/src/amd/vulkan/radv_acceleration_structure.c
@@ -473,6 +473,9 @@ bvh_opt_compare(const void *_a, const void *_b)
 static void
 optimize_bvh(const char *base_ptr, uint32_t *node_ids, uint32_t node_count)
 {
+   if (node_count == 0)
+      return;
+
    float bounds[6];
    for (unsigned i = 0; i < 3; ++i)
       bounds[i] = INFINITY;



More information about the mesa-commit mailing list