Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CVector fix - corrupt memory on size change

Browse Source 
Version bumps
This commit is contained in:
David Anderson
2005-07-23 16:57:21 +00:00
parent c5aae0d8aa
commit e188bf087a
22 changed files with 240 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/sqlite/CVector.h
View File

@ -48,7 +48,8 @@ template <class T> class CVector
return false;
if (m_Data)
{
memcpy(newData, m_Data, m_Size * sizeof(T));
for (size_t i=0; i<m_CurrentUsedSize; i++)
newData[i] = m_Data[i];
delete [] m_Data;
}
m_Data = newData;
@ -74,7 +75,9 @@ template <class T> class CVector
return false;
if (m_Data)
{
memcpy(newData, m_Data, (m_Size < size) ? (m_Size * sizeof(T)) : (size * sizeof(T)));
size_t end = (m_Size < size) ? (m_Size) : size;
for (size_t i=0; i<end; i++)
newData[i] = m_Data[i];
delete [] m_Data;
}
if (m_Size < size)
@ -251,10 +254,11 @@ public:
CVector<T>(const CVector<T> & other)
{
// copy data
m_Data = new T [other.m_Size];
m_Size = other.m_Size;
m_Data = new T [other.m_CurrentUsedSize];
m_Size = other.m_CurrentUsedSize;
m_CurrentUsedSize = other.m_CurrentUsedSize;
memcpy(m_Data, other.m_Data, m_CurrentUsedSize * sizeof(T));
for (size_t i=0; i<other.m_CurrentUsedSize; i++)
m_Data[i] = other.m_Data[i];
}
~CVector<T>()

2
dlls/sqlite/moduleconfig.h
View File

@ -5,7 +5,7 @@
// Module info
#define MODULE_NAME "Sqlite"
#define MODULE_VERSION "1.00"
#define MODULE_VERSION "1.10RC1"
#define MODULE_AUTHOR "AMX Mod X Dev Team"
#define MODULE_URL "http://www.amxmodx.org/"
#define MODULE_LOGTAG "SQLITE"