thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-01-19 03:57:14 +01:00
Code Releases Activity

More validations on identifiers obtained from the server.

Browse Source 
Prevent out_of_range exceptions leak into the script as it would end up in a crash since Sqrat doesn't know how to handle them.
This commit is contained in:
Sandu Liviu Catalin 2016-06-15 06:11:47 +03:00
parent ef41d0d243
commit bca0e1f3c6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/Entity/Player.cpp
View File

@ -1140,8 +1140,16 @@ Object & CPlayer::GetSpectator() const
{
// Validate the managed identifier
Validate();
// Return the requested information
return Core::Get().GetPlayer(_Func->GetPlayerSpectateTarget(m_ID)).mObj;
// Retrieve the identifier of the player
const Int32 id = _Func->GetPlayerSpectateTarget(m_ID);
// Validated the obtained identifier
if (_Func->GetLastError() != vcmpErrorNoSuchEntity && VALID_ENTITYEX(id, SQMOD_PLAYER_POOL))
{
// Return the requested information
return Core::Get().GetPlayer(id).mObj;
}
// Default to a null object
return NullObject();
}
// ------------------------------------------------------------------------------------------------