SH-3405 WIP convert existing stats to lltrace system

fixed trace recording on background threads hitting null pointer

1 files changed, 14 insertions, 5 deletions

diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h
index 2a479b31d7..2cdae4b0d2 100644
--- a/indra/llcommon/lltrace.h
+++ b/indra/llcommon/lltrace.h
@@ -167,15 +167,24 @@ namespace LLTrace
 			size_t next_slot = mNextStorageSlot++;
 			if (next_slot >= mStorageSize)
 			{
-				size_t new_size = mStorageSize + (mStorageSize >> 2);
-				delete [] mStorage;
-				mStorage = new ACCUMULATOR[new_size];
-				mStorageSize = new_size;
+				resize(mStorageSize + (mStorageSize >> 2));
 			}
-			llassert(next_slot < mStorageSize);
+			llassert(mStorage && next_slot < mStorageSize);
 			return next_slot;
 		}
 
+		void resize(size_t new_size)
+		{
+			ACCUMULATOR* old_storage = mStorage;
+			mStorage = new ACCUMULATOR[new_size];
+			for (S32 i = 0; i < mStorageSize; i++)
+			{
+				mStorage[i] = old_storage[i];
+			}
+			mStorageSize = new_size;
+			delete[] old_storage;
+		}
+
 		static AccumulatorBuffer<ACCUMULATOR>& getDefaultBuffer()
 		{
 			static AccumulatorBuffer sBuffer(STATIC_ALLOC);