edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix array sizes and array accesses

Browse source
This commit is contained in:
def 2014-03-23 18:56:07 +01:00
parent ef579f55e2
commit 63f642c478
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/game/server/gamecontext.cpp
View file

@ -1561,9 +1561,9 @@ void CGameContext::ConTuneZone(IConsole::IResult *pResult, void *pUserData)
const char *pParamName = pResult->GetString(1);
float NewValue = pResult->GetFloat(2);
if (List <= 256 && List >= 0)
if (List >= 0 && List < 256)
{
if((pSelf->TuningList()+List)->Set(pParamName, NewValue))
if(pSelf->TuningList()[List].Set(pParamName, NewValue))
{
char aBuf[256];
str_format(aBuf, sizeof(aBuf), "%s in zone %d changed to %.2f", pParamName, List, NewValue);
@ -1580,13 +1580,15 @@ void CGameContext::ConTuneDumpZone(IConsole::IResult *pResult, void *pUserData)
CGameContext *pSelf = (CGameContext *)pUserData;
int List = pResult->GetInteger(0);
char aBuf[256];
if (List <= 256 && List >= 0)
for(int i = 0; i < (pSelf->TuningList()+List)->Num(); i++)
if (List >= 0 && List < 256)
{
float v;
(pSelf->TuningList()+List)->Get(i, &v);
str_format(aBuf, sizeof(aBuf), "zone %d: %s %.2f", List, (pSelf->TuningList()+List)->m_apNames[i], v);
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", aBuf);
for(int i = 0; i < pSelf->TuningList()[List].Num(); i++)
{
float v;
pSelf->TuningList()[List].Get(i, &v);
str_format(aBuf, sizeof(aBuf), "zone %d: %s %.2f", List, pSelf->TuningList()[List].m_apNames[i], v);
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", aBuf);
}
}
}
@ -1597,9 +1599,9 @@ void CGameContext::ConTuneResetZone(IConsole::IResult *pResult, void *pUserData)
if (pResult->NumArguments())
{
int List = pResult->GetInteger(0);
if (List >= 0 && List <= 256)
if (List >= 0 && List < 256)
{
*(pSelf->TuningList()+List) = TuningParams;
pSelf->TuningList()[List] = TuningParams;
char aBuf[256];
str_format(aBuf, sizeof(aBuf), "Tunezone %d resetted", List);
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "tuning", aBuf);
@ -1621,9 +1623,9 @@ void CGameContext::ConTuneSetZoneMsgEnter(IConsole::IResult *pResult, void *pUse
if (pResult->NumArguments())
{
int List = pResult->GetInteger(0);
if (List >= 0 && List <= 256)
if (List >= 0 && List < 256)
{
str_format(pSelf->m_ZoneEnterMsg [List], sizeof(pSelf->m_ZoneEnterMsg [List]), pResult->GetString(1));
str_format(pSelf->m_ZoneEnterMsg[List], sizeof(pSelf->m_ZoneEnterMsg[List]), pResult->GetString(1));
}
}
}
@ -1634,9 +1636,9 @@ void CGameContext::ConTuneSetZoneMsgLeave(IConsole::IResult *pResult, void *pUse
if (pResult->NumArguments())
{
int List = pResult->GetInteger(0);
if (List >= 0 && List <= 256)
if (List >= 0 && List < 256)
{
str_format(pSelf->m_ZoneLeaveMsg [List], sizeof(pSelf->m_ZoneLeaveMsg [List]), pResult->GetString(1));
str_format(pSelf->m_ZoneLeaveMsg[List], sizeof(pSelf->m_ZoneLeaveMsg[List]), pResult->GetString(1));
}
}
}

6
src/game/server/gamecontext.h
View file

@ -53,7 +53,7 @@ class CGameContext : public IGameServer
CCollision m_Collision;
CNetObjHandler m_NetObjHandler;
CTuningParams m_Tuning;
CTuningParams m_TuningList [256];
CTuningParams m_TuningList[256];
static void ConTuneParam(IConsole::IResult *pResult, void *pUserData);
static void ConTuneReset(IConsole::IResult *pResult, void *pUserData);
@ -124,8 +124,8 @@ public:
char m_aVoteReason[VOTE_REASON_LENGTH];
int m_NumVoteOptions;
int m_VoteEnforce;
char m_ZoneEnterMsg [257] [64]; // 0 is used for switching from or to area without tunings
char m_ZoneLeaveMsg [257] [64];
char m_ZoneEnterMsg[64][256]; // 0 is used for switching from or to area without tunings
char m_ZoneLeaveMsg[64][256];
enum
{