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

Fixed crash when passed bad ref in ReferenceToEntity (bug 5330, r=asherkin).

Browse Source
This commit is contained in:
Drifter 2012-05-31 07:32:07 -04:00
parent 89325f9995
commit 36f5200abc
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/HalfLife2.cpp
View File

@ -832,6 +832,11 @@ cell_t CHalfLife2::EntityToReference(CBaseEntity *pEntity)
CBaseEntity *CHalfLife2::ReferenceToEntity(cell_t entRef) CBaseEntity *CHalfLife2::ReferenceToEntity(cell_t entRef)
{ {
if (entRef == INVALID_EHANDLE_INDEX)
{
return NULL;
}
CEntInfo *pInfo = NULL; CEntInfo *pInfo = NULL;
if (entRef & (1<<31)) if (entRef & (1<<31))
@ -841,7 +846,7 @@ CBaseEntity *CHalfLife2::ReferenceToEntity(cell_t entRef)
CBaseHandle hndl(hndlValue); CBaseHandle hndl(hndlValue);
pInfo = LookupEntity(hndl.GetEntryIndex()); pInfo = LookupEntity(hndl.GetEntryIndex());
if (pInfo->m_SerialNumber != hndl.GetSerialNumber()) if (!pInfo || pInfo->m_SerialNumber != hndl.GetSerialNumber())
{ {
return NULL; return NULL;
} }