livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for DRTVWR-233

meow-7.2.2
Oz Linden 2012-10-19 14:06:55 -04:00
parent c8fcb6c798 04a16d2836
commit 246d2b9476
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -325,3 +325,4 @@ fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179
1dc94555582f52718834081e7659e973ae4521f7 3.4.1-beta8
52c164c8023a5e65f3dc1b0bbb7fa1dd0c631b6b DRTVWR-231
9c4519aa5c70f7560111fb5c740d3a7dc20a845a 3.4.1-beta9
464cf7a63a9a2f95bc4972dc022ca765e93de7d3 DRTVWR-233

6
indra/llcommon/llmemory.h
View File

@ -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;