From 5a2f71b0bc30804c3ca40ac4fc49e1257ad43106 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 17 Oct 2012 18:18:06 -0500 Subject: MAINT-1527 Fix for crash on exit when VBO disabled --- indra/newview/pipeline.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 2edb5cf852..b42a84da47 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -695,6 +695,8 @@ void LLPipeline::cleanup() mInitialized = FALSE; mDeferredVB = NULL; + + mCubeVB = NULL; } //============================================================================ -- cgit v1.2.3 From 11017315e6f0cdcc247a875e41d027beac8df764 Mon Sep 17 00:00:00 2001 From: William Todd Stinson Date: Thu, 18 Oct 2012 17:36:57 -0700 Subject: MAINT-1753: Correcting behavior of ll_aligned_realloc_16() on Linux to avoid memory corruption in the case that the new memory size requested is smaller than the old memory size. Also, adding check to ensure that the aligned malloc returns a non-null value before memcopying. --- indra/llcommon/llmemory.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3 From f71d2a649b62c115eca4d56d8800d2d6ae9f57a0 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 19 Oct 2012 10:31:11 -0400 Subject: tag merge of DRTVWR-231 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index b9c59588e1..1c986e9772 100644 --- a/.hgtags +++ b/.hgtags @@ -323,3 +323,4 @@ fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179 524da902713e8b60322640b9825101add4a7c497 3.4.1-beta7 173c2809f9873499c4b9d6bc044ec941c954d3fb DRTVWR-228 1dc94555582f52718834081e7659e973ae4521f7 3.4.1-beta8 +52c164c8023a5e65f3dc1b0bbb7fa1dd0c631b6b DRTVWR-231 -- cgit v1.2.3 From c8fcb6c798b46ffbffdfa3c04bdb2846a87a60d4 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 19 Oct 2012 11:33:24 -0400 Subject: Added tag 3.4.1-beta9 for changeset 9c4519aa5c70 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 1c986e9772..b53dd3ce9e 100644 --- a/.hgtags +++ b/.hgtags @@ -324,3 +324,4 @@ fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179 173c2809f9873499c4b9d6bc044ec941c954d3fb DRTVWR-228 1dc94555582f52718834081e7659e973ae4521f7 3.4.1-beta8 52c164c8023a5e65f3dc1b0bbb7fa1dd0c631b6b DRTVWR-231 +9c4519aa5c70f7560111fb5c740d3a7dc20a845a 3.4.1-beta9 -- cgit v1.2.3 From 04a16d2836b3c8517d367861d3dea632a0d58fc1 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 19 Oct 2012 14:06:50 -0400 Subject: tag merge of DRTVWR-233 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index b9c59588e1..4935499e24 100644 --- a/.hgtags +++ b/.hgtags @@ -323,3 +323,4 @@ fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179 524da902713e8b60322640b9825101add4a7c497 3.4.1-beta7 173c2809f9873499c4b9d6bc044ec941c954d3fb DRTVWR-228 1dc94555582f52718834081e7659e973ae4521f7 3.4.1-beta8 +464cf7a63a9a2f95bc4972dc022ca765e93de7d3 DRTVWR-233 -- cgit v1.2.3 From f2a674274fc043e55ad3e78e05120d34ed2ff361 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 19 Oct 2012 14:07:05 -0400 Subject: Added tag 3.4.1-beta9 for changeset 637fe8bbee5e --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index 3f70231561..dc7ca3db19 100644 --- a/.hgtags +++ b/.hgtags @@ -326,3 +326,5 @@ fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179 52c164c8023a5e65f3dc1b0bbb7fa1dd0c631b6b DRTVWR-231 9c4519aa5c70f7560111fb5c740d3a7dc20a845a 3.4.1-beta9 464cf7a63a9a2f95bc4972dc022ca765e93de7d3 DRTVWR-233 +9c4519aa5c70f7560111fb5c740d3a7dc20a845a 3.4.1-beta9 +637fe8bbee5e24940448198c221d5ee0fa3247b4 3.4.1-beta9 -- cgit v1.2.3