From f591ef20e2ea0fa1d35fa9940e29564896f4a9bb Mon Sep 17 00:00:00 2001 From: Stenzek Date: Tue, 27 Oct 2026 02:31:59 +1000 Subject: [PATCH] Common: Fix heap overflow when shrinking DynamicHeapArray Don't think this actually happens anywhere, but just in case. --- src/common-tests/heap_array_tests.cpp | 17 +++++++++++++++++ src/common/heap_array.h | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/common-tests/heap_array_tests.cpp b/src/common-tests/heap_array_tests.cpp index ca7645ef0..44d49348c 100644 --- a/src/common-tests/heap_array_tests.cpp +++ b/src/common-tests/heap_array_tests.cpp @@ -670,6 +670,23 @@ TEST(DynamicHeapArray, AlignedResize) EXPECT_EQ(arr[i], 42); } +TEST(DynamicHeapArray, AlignedResizeShrink) +{ + constexpr size_t alignment = 64; + DynamicHeapArray arr(32); + for (size_t i = 0; i < arr.size(); ++i) + arr[i] = static_cast(i * 10); + + arr.resize(7); + + EXPECT_EQ(arr.size(), 7u); + EXPECT_EQ(arr.capacity(), 7u); + EXPECT_EQ(arr.size_bytes(), 7u * sizeof(int)); + EXPECT_EQ(reinterpret_cast(arr.data()) % alignment, 0u); + for (size_t i = 0; i < arr.size(); ++i) + EXPECT_EQ(arr[i], static_cast(i * 10)); +} + TEST(DynamicHeapArray, DifferentTypes) { DynamicHeapArray arr(3); diff --git a/src/common/heap_array.h b/src/common/heap_array.h index 5313e6f34..a03fbd23d 100644 --- a/src/common/heap_array.h +++ b/src/common/heap_array.h @@ -461,7 +461,7 @@ private: if (prev_ptr) { - std::memcpy(m_data, prev_ptr, prev_size * sizeof(T)); + std::memcpy(m_data, prev_ptr, std::min(size, prev_size) * sizeof(T)); std::free(prev_ptr); } #endif