diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-19 11:21:18 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-19 11:21:18 -0700 |
| commit | 31f622ca049719e8d4da9368c1e7d5694ed069aa (patch) | |
| tree | 793f5ecdff40e5ae5917dea89dd3fcc31ebe6977 | |
| parent | 155cb976cb807771772b6bab62709709348c918b (diff) | |
| parent | f2a674274fc043e55ad3e78e05120d34ed2ff361 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
| -rw-r--r-- | .hgtags | 5 | ||||
| -rw-r--r-- | indra/llcommon/llmemory.h | 6 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
3 files changed, 12 insertions, 1 deletions
@@ -324,3 +324,8 @@ fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179 524da902713e8b60322640b9825101add4a7c497 3.4.1-beta7 173c2809f9873499c4b9d6bc044ec941c954d3fb DRTVWR-228 1dc94555582f52718834081e7659e973ae4521f7 3.4.1-beta8 +52c164c8023a5e65f3dc1b0bbb7fa1dd0c631b6b DRTVWR-231 +9c4519aa5c70f7560111fb5c740d3a7dc20a845a 3.4.1-beta9 +464cf7a63a9a2f95bc4972dc022ca765e93de7d3 DRTVWR-233 +9c4519aa5c70f7560111fb5c740d3a7dc20a845a 3.4.1-beta9 +637fe8bbee5e24940448198c221d5ee0fa3247b4 3.4.1-beta9 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; diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index ba047487f5..b6f3301c6c 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -706,6 +706,8 @@ void LLPipeline::cleanup() mInitialized = FALSE; mDeferredVB = NULL; + + mCubeVB = NULL; } //============================================================================ |