reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2024-12-26 22:55:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix for range loop in CUtlVector (Sync from dreamstalker/rehlds#697)

Browse Source
This commit is contained in:
s1lent 2019-06-06 00:34:40 +07:00
parent 309d5c5c6d
commit e9c41c33d2
No known key found for this signature in database
GPG Key ID: 0FE401DC73916B5C
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
regamedll/public/utlmemory.h
View File

@ -262,6 +262,7 @@ void CUtlMemory<T, I>::Grow(int num)
// Make sure we have at least numallocated + num allocations.
// Use the grow rules specified for this memory (in m_nGrowSize)
int nAllocationRequested = m_nAllocationCount + num;
bool needToReallocate = false;
while (m_nAllocationCount < nAllocationRequested)
{
if (m_nAllocationCount != 0)
@ -274,6 +275,7 @@ void CUtlMemory<T, I>::Grow(int num)
{
m_nAllocationCount += m_nAllocationCount;
}
needToReallocate = true;
}
else
{
@ -283,11 +285,11 @@ void CUtlMemory<T, I>::Grow(int num)
}
}
if (m_pMemory)
if (m_pMemory && needToReallocate)
{
m_pMemory = (T *)realloc(m_pMemory, m_nAllocationCount * sizeof(T));
}
else
else if (!m_pMemory)
{
m_pMemory = (T *)malloc(m_nAllocationCount * sizeof(T));
}

4
regamedll/public/utlvector.h
View File

@ -43,10 +43,10 @@ public:
// features C++11 ranged based for
T *begin() { return &m_Memory[0]; }
T *end() { return &m_Memory[m_Size - 1]; }
T *end() { return &m_Memory[m_Size]; }
T const *begin() const { return &m_Memory[0]; }
T const *end() const { return &m_Memory[m_Size - 1]; }
T const *end() const { return &m_Memory[m_Size]; }
// Copy the array.
CUtlVector<T> &operator=(const CUtlVector<T> &other);