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

Fixed three bugs with team natives that appeared on INS: bounds checking had wrong binary shortcut order, bounds checking was off by one, error condition was not returned properly. Out-of-range team indexes no longer cause crashes now.

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%402523
This commit is contained in:
David Anderson 2008-09-07 22:17:12 +00:00
parent 9ca1ca62ea
commit e141cf74d5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/sdktools/teamnatives.cpp
View File

@ -112,9 +112,9 @@ static cell_t GetTeamCount(IPluginContext *pContext, const cell_t *params)
static cell_t GetTeamName(IPluginContext *pContext, const cell_t *params)
{
int teamindex = params[1];
if (!g_Teams[teamindex].ClassName || (teamindex > (int)g_Teams.size()))
if (teamindex >= (int)g_Teams.size() || !g_Teams[teamindex].ClassName)
{
pContext->ThrowNativeError("Team index %d is invalid", teamindex);
return pContext->ThrowNativeError("Team index %d is invalid", teamindex);
}
static int offset = g_pGameHelpers->FindInSendTable(g_Teams[teamindex].ClassName, "m_szTeamname")->GetOffset();
@ -128,9 +128,9 @@ static cell_t GetTeamName(IPluginContext *pContext, const cell_t *params)
static cell_t GetTeamScore(IPluginContext *pContext, const cell_t *params)
{
int teamindex = params[1];
if (!g_Teams[teamindex].ClassName || (teamindex > (int)g_Teams.size()))
if (teamindex >= (int)g_Teams.size() || !g_Teams[teamindex].ClassName)
{
pContext->ThrowNativeError("Team index %d is invalid", teamindex);
return pContext->ThrowNativeError("Team index %d is invalid", teamindex);
}
static int offset = g_pGameHelpers->FindInSendTable(g_Teams[teamindex].ClassName, "m_iScore")->GetOffset();
@ -141,9 +141,9 @@ static cell_t GetTeamScore(IPluginContext *pContext, const cell_t *params)
static cell_t SetTeamScore(IPluginContext *pContext, const cell_t *params)
{
int teamindex = params[1];
if (!g_Teams[teamindex].ClassName || (teamindex > (int)g_Teams.size()))
if (teamindex >= (int)g_Teams.size() || !g_Teams[teamindex].ClassName)
{
pContext->ThrowNativeError("Team index %d is invalid", teamindex);
return pContext->ThrowNativeError("Team index %d is invalid", teamindex);
}
static int offset = g_pGameHelpers->FindInSendTable(g_Teams[teamindex].ClassName, "m_iScore")->GetOffset();
@ -155,9 +155,9 @@ static cell_t SetTeamScore(IPluginContext *pContext, const cell_t *params)
static cell_t GetTeamClientCount(IPluginContext *pContext, const cell_t *params)
{
int teamindex = params[1];
if (!g_Teams[teamindex].ClassName || (teamindex > (int)g_Teams.size()))
if (teamindex >= (int)g_Teams.size() || !g_Teams[teamindex].ClassName)
{
pContext->ThrowNativeError("Team index %d is invalid", teamindex);
return pContext->ThrowNativeError("Team index %d is invalid", teamindex);
}
SendProp *pProp = g_pGameHelpers->FindInSendTable(g_Teams[teamindex].ClassName, "\"player_array\"");