UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix crash in CloneArray for too large arrays (#566)

Browse Source 
If there is not enough memory to clone an array, throw an error instead
of crashing the server.
This commit is contained in:
peace-maker 2016-12-11 21:55:11 -07:00 committed by Kyle Sanderson
parent d3d16a93cf
commit b74573fa12
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/logic/CellArray.h
View File

@ -186,6 +186,12 @@ public:
array->m_AllocSize = m_AllocSize; array->m_AllocSize = m_AllocSize;
array->m_Size = m_Size; array->m_Size = m_Size;
array->m_Data = (cell_t *)malloc(sizeof(cell_t) * m_BlockSize * m_AllocSize); array->m_Data = (cell_t *)malloc(sizeof(cell_t) * m_BlockSize * m_AllocSize);
if (!array->m_Data)
{
delete array;
return NULL;
}
memcpy(array->m_Data, m_Data, sizeof(cell_t) * m_BlockSize * m_Size); memcpy(array->m_Data, m_Data, sizeof(cell_t) * m_BlockSize * m_Size);
return array; return array;
} }

4
core/logic/smn_adt_array.cpp
View File

@ -503,6 +503,10 @@ static cell_t CloneArray(IPluginContext *pContext, const cell_t *params)
} }
ICellArray *array = oldArray->clone(); ICellArray *array = oldArray->clone();
if (!array)
{
return pContext->ThrowNativeError("Failed to clone array. Out of memory.");
}
Handle_t hndl = handlesys->CreateHandle(htCellArray, array, pContext->GetIdentity(), g_pCoreIdent, NULL); Handle_t hndl = handlesys->CreateHandle(htCellArray, array, pContext->GetIdentity(), g_pCoreIdent, NULL);
if (!hndl) if (!hndl)