Skip to content
Snippets Groups Projects
Commit 1b0ea26e authored by Oz Linden's avatar Oz Linden
Browse files

merge back late fix for MAINT-1753

parents 1d3487e2 f2a67427
No related branches found
No related tags found
No related merge requests found
......@@ -335,4 +335,5 @@ fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179
173c2809f9873499c4b9d6bc044ec941c954d3fb DRTVWR-228
1dc94555582f52718834081e7659e973ae4521f7 3.4.1-beta8
52c164c8023a5e65f3dc1b0bbb7fa1dd0c631b6b DRTVWR-231
9c4519aa5c70f7560111fb5c740d3a7dc20a845a 3.4.1-beta9
464cf7a63a9a2f95bc4972dc022ca765e93de7d3 DRTVWR-233
637fe8bbee5e24940448198c221d5ee0fa3247b4 3.4.1-beta9
......@@ -87,7 +87,11 @@ inline void* ll_aligned_realloc_16(void* ptr, size_t size, size_t old_size) // r
void* ret = ll_aligned_malloc_16(size);
if (ptr)
{
memcpy(ret, ptr, old_size);
if (ret)
{
// Only copy the size of the smallest memory block to avoid memory corruption.
memcpy(ret, ptr, llmin(old_size, size));
}
ll_aligned_free_16(ptr);
}
return ret;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment