CUtlMemory: update the copy from method

Wend4r · Nov 25, 2024 · 2a8257f · 2a8257f
1 parent 5a926ff
commit 2a8257f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/public/tier1/utlmemory.h b/public/tier1/utlmemory.h
@@ -489,8 +489,12 @@ CUtlMemory<T,I>& CUtlMemory<T,I>::operator=( CUtlMemory& moveFrom )
 template< class T, class I >
 void CUtlMemory<T,I>::CopyFrom( const CUtlMemory& from )
 {
-	Init( from.m_nAllocationCount, from.m_nGrowSize );
-	memcpy( m_pMemory, from.m_pMemory, from.m_nAllocationCount * sizeof(T) );
+	Init( from.m_nGrowSize, from.m_nAllocationCount );
+
+	if( m_pMemory )
+	{
+		memcpy( m_pMemory, from.m_pMemory, from.m_nAllocationCount * sizeof(T) );
+	}
 }
 
 template< class T, class I >