From 99e29b83401a1d6da9dbca03a64c0bfd7bad6298 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 18 Oct 2013 13:10:40 -0700
Subject: [PATCH] crash fix - bad handling of instancetracker iterators
---
indra/llcommon/llfasttimer.cpp | 2 +-
indra/llcommon/llinstancetracker.cpp | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index d97fa74c245..4744be72368 100755
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -193,7 +193,7 @@ TimeBlockTreeNode& BlockTimerStatHandle::getTreeNode() const
void BlockTimerStatHandle::bootstrapTimerTree()
{
- for (BlockTimerStatHandle::instance_tracker_t::instance_iter begin_it = BlockTimerStatHandle::instance_tracker_t::beginInstances(), end_it = BlockTimerStatHandle::instance_tracker_t::endInstances(), it = begin_it;
+ for (BlockTimerStatHandle::instance_tracker_t::instance_iter it = BlockTimerStatHandle::instance_tracker_t::beginInstances(), end_it = BlockTimerStatHandle::instance_tracker_t::endInstances();
it != end_it;
++it)
{
diff --git a/indra/llcommon/llinstancetracker.cpp b/indra/llcommon/llinstancetracker.cpp
index 7ff8324fe34..11fc53f8c88 100755
--- a/indra/llcommon/llinstancetracker.cpp
+++ b/indra/llcommon/llinstancetracker.cpp
@@ -41,6 +41,7 @@ void LLInstanceTrackerBase::StaticBase::incrementDepth()
void LLInstanceTrackerBase::StaticBase::decrementDepth()
{
+ llassert(sIterationNestDepth);
apr_atomic_dec32(&sIterationNestDepth);
}
--
GitLab