diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-10-19 14:06:55 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-10-19 14:06:55 -0400 |
| commit | 246d2b9476d787d7d593603eb14f58c0127ee6e1 (patch) | |
| tree | 0e552b7fa3c846bbc9450cbabb4a4e06d549ffb8 | |
| parent | c8fcb6c798b46ffbffdfa3c04bdb2846a87a60d4 (diff) | |
| parent | 04a16d2836b3c8517d367861d3dea632a0d58fc1 (diff) | |
merge changes for DRTVWR-233
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/llcommon/llmemory.h | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -325,3 +325,4 @@ fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179 1dc94555582f52718834081e7659e973ae4521f7 3.4.1-beta8 52c164c8023a5e65f3dc1b0bbb7fa1dd0c631b6b DRTVWR-231 9c4519aa5c70f7560111fb5c740d3a7dc20a845a 3.4.1-beta9 +464cf7a63a9a2f95bc4972dc022ca765e93de7d3 DRTVWR-233 diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index 40cde485cf..10013e0f92 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -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; |