mirror of
https://github.com/stenzek/duckstation.git
synced 2026-11-16 03:00:39 +01:00
Common: Fix heap overflow when shrinking DynamicHeapArray
Don't think this actually happens anywhere, but just in case.
This commit is contained in:
2 files changed
+18
-1
No files matched your search
@@ -670,6 +670,23 @@ TEST(DynamicHeapArray, AlignedResize)
|
||||
EXPECT_EQ(arr[i], 42);
|
||||
}
|
||||
|
||||
TEST(DynamicHeapArray, AlignedResizeShrink)
|
||||
{
|
||||
constexpr size_t alignment = 64;
|
||||
DynamicHeapArray<int, alignment> arr(32);
|
||||
for (size_t i = 0; i < arr.size(); ++i)
|
||||
arr[i] = static_cast<int>(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<uintptr_t>(arr.data()) % alignment, 0u);
|
||||
for (size_t i = 0; i < arr.size(); ++i)
|
||||
EXPECT_EQ(arr[i], static_cast<int>(i * 10));
|
||||
}
|
||||
|
||||
TEST(DynamicHeapArray, DifferentTypes)
|
||||
{
|
||||
DynamicHeapArray<double> arr(3);
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user