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

Merge pull request #343 from alliedmodders/fix-sizes

Browse Source 
Fix some buffer sizes in shipped plugins.
This commit is contained in:
Nicholas Hastings 2015-06-04 18:27:52 -04:00
commit 850a73d718
18 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/admin-sql-threaded.sp
View File

@ -457,8 +457,8 @@ public void OnReceiveUser(Database db, DBResultSet rs, const char[] error, any d
void FetchUser(Database db, int client) void FetchUser(Database db, int client)
{ {
char name[65]; char name[MAX_NAME_LENGTH];
char safe_name[140]; char safe_name[(MAX_NAME_LENGTH * 2) - 1];
char steamid[32]; char steamid[32];
char steamidalt[32]; char steamidalt[32];
char ipaddr[24]; char ipaddr[24];

2
plugins/basebans/ban.sp
View File

@ -49,7 +49,7 @@ PrepareBan(client, target, time, const String:reason[])
return; return;
} }
new String:name[32]; new String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
if (!time) if (!time)

6
plugins/basevotes/votemap.sp
View File

@ -109,7 +109,7 @@ public MenuHandler_Confirm(Menu menu, MenuAction action, int param1, int param2)
} }
else if (action == MenuAction_Select) else if (action == MenuAction_Select)
{ {
decl String:maps[5][64]; decl String:maps[5][PLATFORM_MAX_PATH];
new selectedmaps = GetArraySize(g_SelectedMaps); new selectedmaps = GetArraySize(g_SelectedMaps);
for (new i = 0; i < selectedmaps; i++) for (new i = 0; i < selectedmaps; i++)
@ -233,7 +233,7 @@ public Action:Command_Votemap(client, args)
decl String:text[256]; decl String:text[256];
GetCmdArgString(text, sizeof(text)); GetCmdArgString(text, sizeof(text));
decl String:maps[5][64]; decl String:maps[5][PLATFORM_MAX_PATH];
new mapCount; new mapCount;
new len, pos; new len, pos;
@ -283,7 +283,7 @@ int LoadMapList(Menu menu)
RemoveAllMenuItems(menu); RemoveAllMenuItems(menu);
char map_name[64]; char map_name[PLATFORM_MAX_PATH];
new map_count = GetArraySize(g_map_array); new map_count = GetArraySize(g_map_array);
for (new i = 0; i < map_count; i++) for (new i = 0; i < map_count; i++)

2
plugins/funcommands/beacon.sp
View File

@ -184,7 +184,7 @@ public MenuHandler_Beacon(Menu menu, MenuAction action, int param1, int param2)
} }
else else
{ {
new String:name[32]; new String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
PerformBeacon(param1, target); PerformBeacon(param1, target);

2
plugins/funcommands/blind.sp
View File

@ -208,7 +208,7 @@ public MenuHandler_Amount(Menu menu, MenuAction action, int param1, int param2)
} }
else else
{ {
new String:name[32]; new String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
PerformBlind(param1, target, amount); PerformBlind(param1, target, amount);

2
plugins/funcommands/drug.sp
View File

@ -265,7 +265,7 @@ public MenuHandler_Drug(Menu menu, MenuAction action, int param1, int param2)
} }
else else
{ {
new String:name[32]; new String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
PerformDrug(param1, target, 2); PerformDrug(param1, target, 2);

6
plugins/funcommands/fire.sp
View File

@ -125,7 +125,7 @@ public Action:Timer_FireBomb(Handle:timer, any:value)
SetEntityRenderColor(client, 255, color, color, 255); SetEntityRenderColor(client, 255, color, color, 255);
char name[64]; char name[MAX_NAME_LENGTH];
GetClientName(client, name, sizeof(name)); GetClientName(client, name, sizeof(name));
PrintCenterTextAll("%t", "Till Explodes", name, g_FireBombTime[client]); PrintCenterTextAll("%t", "Till Explodes", name, g_FireBombTime[client]);
@ -304,7 +304,7 @@ public MenuHandler_Burn(Menu menu, MenuAction action, int param1, int param2)
} }
else else
{ {
new String:name[32]; new String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
PerformBurn(param1, target, 20.0); PerformBurn(param1, target, 20.0);
ShowActivity2(param1, "[SM] ", "%t", "Set target on fire", "_s", name); ShowActivity2(param1, "[SM] ", "%t", "Set target on fire", "_s", name);
@ -349,7 +349,7 @@ public MenuHandler_FireBomb(Menu menu, MenuAction action, int param1, int param2
} }
else else
{ {
new String:name[32]; new String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
PerformFireBomb(param1, target); PerformFireBomb(param1, target);

2
plugins/funcommands/gravity.sp
View File

@ -165,7 +165,7 @@ public MenuHandler_GravityAmount(Menu menu, MenuAction action, int param1, int p
} }
else else
{ {
new String:name[32]; new String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
PerformGravity(param1, target, amount); PerformGravity(param1, target, amount);

6
plugins/funcommands/ice.sp
View File

@ -246,7 +246,7 @@ public Action:Timer_FreezeBomb(Handle:timer, any:value)
SetEntityRenderColor(client, color, color, 255, 255); SetEntityRenderColor(client, color, color, 255, 255);
char name[64]; char name[MAX_NAME_LENGTH];
GetClientName(client, name, sizeof(name)); GetClientName(client, name, sizeof(name));
PrintCenterTextAll("%t", "Till Explodes", name, g_FreezeBombTime[client]); PrintCenterTextAll("%t", "Till Explodes", name, g_FreezeBombTime[client]);
@ -418,7 +418,7 @@ public MenuHandler_Freeze(Menu menu, MenuAction action, int param1, int param2)
} }
else else
{ {
new String:name[32]; new String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
PerformFreeze(param1, target, g_Cvar_FreezeDuration.IntValue); PerformFreeze(param1, target, g_Cvar_FreezeDuration.IntValue);
@ -464,7 +464,7 @@ public MenuHandler_FreezeBomb(Menu menu, MenuAction action, int param1, int para
} }
else else
{ {
new String:name[32]; new String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
PerformFreezeBomb(param1, target); PerformFreezeBomb(param1, target);

2
plugins/funcommands/noclip.sp
View File

@ -109,7 +109,7 @@ public MenuHandler_NoClip(Menu menu, MenuAction action, int param1, int param2)
} }
else else
{ {
new String:name[32]; new String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
PerformNoClip(param1, target); PerformNoClip(param1, target);

4
plugins/funcommands/timebomb.sp
View File

@ -118,7 +118,7 @@ public Action:Timer_TimeBomb(Handle:timer, any:value)
SetEntityRenderColor(client, 255, 128, color, 255); SetEntityRenderColor(client, 255, 128, color, 255);
char name[64]; char name[MAX_NAME_LENGTH];
GetClientName(client, name, sizeof(name)); GetClientName(client, name, sizeof(name));
PrintCenterTextAll("%t", "Till Explodes", name, g_TimeBombTime[client]); PrintCenterTextAll("%t", "Till Explodes", name, g_TimeBombTime[client]);
@ -275,7 +275,7 @@ public MenuHandler_TimeBomb(Menu menu, MenuAction action, int param1, int param2
} }
else else
{ {
new String:name[32]; new String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
PerformTimeBomb(param1, target); PerformTimeBomb(param1, target);

2
plugins/funvotes.sp
View File

@ -283,7 +283,7 @@ VoteSelect(Handle:menu, param1, param2 = 0)
{ {
if (GetConVarInt(g_Cvar_VoteShow) == 1) if (GetConVarInt(g_Cvar_VoteShow) == 1)
{ {
decl String:voter[64], String:junk[64], String:choice[64]; decl String:voter[MAX_NAME_LENGTH], String:junk[64], String:choice[64];
GetClientName(param1, voter, sizeof(voter)); GetClientName(param1, voter, sizeof(voter));
menu.GetItem(param2, junk, sizeof(junk), _, choice, sizeof(choice)); menu.GetItem(param2, junk, sizeof(junk), _, choice, sizeof(choice));
PrintToChatAll("[SM] %T", "Vote Select", LANG_SERVER, voter, choice); PrintToChatAll("[SM] %T", "Vote Select", LANG_SERVER, voter, choice);

6
plugins/include/helpers.inc
View File

@ -46,7 +46,7 @@
stock FormatUserLogText(client, String:buffer[], maxlength) stock FormatUserLogText(client, String:buffer[], maxlength)
{ {
decl String:auth[32]; decl String:auth[32];
decl String:name[40]; decl String:name[MAX_NAME_LENGTH];
new userid = GetClientUserId(client); new userid = GetClientUserId(client);
if (!GetClientAuthString(client, auth, sizeof(auth))) if (!GetClientAuthString(client, auth, sizeof(auth)))
@ -107,7 +107,7 @@ stock int SearchForClients(const char[] pattern, int[] clients, int maxClients)
if (pattern[0] == '#') { if (pattern[0] == '#') {
int input = StringToInt(pattern[1]); int input = StringToInt(pattern[1]);
if (!input) { if (!input) {
char name[65]; char name[MAX_NAME_LENGTH];
for (int i=1; i<=MaxClients; i++) { for (int i=1; i<=MaxClients; i++) {
if (!IsClientInGame(i)) if (!IsClientInGame(i))
continue; continue;
@ -126,7 +126,7 @@ stock int SearchForClients(const char[] pattern, int[] clients, int maxClients)
} }
} }
char name[65]; char name[MAX_NAME_LENGTH];
for (int i=1; i<=MaxClients; i++) for (int i=1; i<=MaxClients; i++)
{ {
if (!IsClientInGame(i)) if (!IsClientInGame(i))

12
plugins/nextmap.sp
View File

@ -86,8 +86,8 @@ public void OnPluginStart()
RegConsoleCmd("listmaps", Command_List); RegConsoleCmd("listmaps", Command_List);
// Set to the current map so OnMapStart() will know what to do // Set to the current map so OnMapStart() will know what to do
char currentMap[64]; char currentMap[PLATFORM_MAX_PATH];
GetCurrentMap(currentMap, 64); GetCurrentMap(currentMap, sizeof(currentMap));
SetNextMap(currentMap); SetNextMap(currentMap);
} }
@ -98,9 +98,9 @@ public void OnMapStart()
public void OnConfigsExecuted() public void OnConfigsExecuted()
{ {
char lastMap[64], currentMap[64]; char lastMap[PLATFORM_MAX_PATH], currentMap[PLATFORM_MAX_PATH];
GetNextMap(lastMap, sizeof(lastMap)); GetNextMap(lastMap, sizeof(lastMap));
GetCurrentMap(currentMap, 64); GetCurrentMap(currentMap, sizeof(currentMap));
// Why am I doing this? If we switched to a new map, but it wasn't what we expected (Due to sm_map, sm_votemap, or // Why am I doing this? If we switched to a new map, but it wasn't what we expected (Due to sm_map, sm_votemap, or
// some other plugin/command), we don't want to scramble the map cycle. Or for example, admin switches to a custom map // some other plugin/command), we don't want to scramble the map cycle. Or for example, admin switches to a custom map
@ -146,8 +146,8 @@ void FindAndSetNextMap()
if (g_MapPos == -1) if (g_MapPos == -1)
{ {
char current[64]; char current[PLATFORM_MAX_PATH];
GetCurrentMap(current, 64); GetCurrentMap(current, sizeof(current));
for (int i = 0; i < mapCount; i++) for (int i = 0; i < mapCount; i++)
{ {

18
plugins/nominations.sp
View File

@ -123,7 +123,7 @@ public Action Command_Addmap(int client, int args)
return Plugin_Handled; return Plugin_Handled;
} }
char mapname[64]; char mapname[PLATFORM_MAX_PATH];
GetCmdArg(1, mapname, sizeof(mapname)); GetCmdArg(1, mapname, sizeof(mapname));
@ -184,7 +184,7 @@ public Action Command_Nominate(int client, int args)
return Plugin_Handled; return Plugin_Handled;
} }
char mapname[64]; char mapname[PLATFORM_MAX_PATH];
GetCmdArg(1, mapname, sizeof(mapname)); GetCmdArg(1, mapname, sizeof(mapname));
int status; int status;
@ -234,7 +234,7 @@ public Action Command_Nominate(int client, int args)
g_mapTrie.SetValue(mapname, MAPSTATUS_DISABLED|MAPSTATUS_EXCLUDE_NOMINATED); g_mapTrie.SetValue(mapname, MAPSTATUS_DISABLED|MAPSTATUS_EXCLUDE_NOMINATED);
char name[64]; char name[MAX_NAME_LENGTH];
GetClientName(client, name, sizeof(name)); GetClientName(client, name, sizeof(name));
PrintToChatAll("[SM] %t", "Map Nominated", name, mapname); PrintToChatAll("[SM] %t", "Map Nominated", name, mapname);
@ -257,10 +257,10 @@ void BuildMapMenu()
g_MapMenu = new Menu(Handler_MapSelectMenu, MENU_ACTIONS_DEFAULT|MenuAction_DrawItem|MenuAction_DisplayItem); g_MapMenu = new Menu(Handler_MapSelectMenu, MENU_ACTIONS_DEFAULT|MenuAction_DrawItem|MenuAction_DisplayItem);
char map[64]; char map[PLATFORM_MAX_PATH];
ArrayList excludeMaps; ArrayList excludeMaps;
char currentMap[32]; char currentMap[PLATFORM_MAX_PATH];
if (g_Cvar_ExcludeOld.BoolValue) if (g_Cvar_ExcludeOld.BoolValue)
{ {
@ -312,10 +312,10 @@ public int Handler_MapSelectMenu(Menu menu, MenuAction action, int param1, int p
{ {
case MenuAction_Select: case MenuAction_Select:
{ {
char map[64], name[64]; char map[PLATFORM_MAX_PATH], name[MAX_NAME_LENGTH];
menu.GetItem(param2, map, sizeof(map)); menu.GetItem(param2, map, sizeof(map));
GetClientName(param1, name, 64); GetClientName(param1, name, sizeof(name));
NominateResult result = NominateMap(map, false, param1); NominateResult result = NominateMap(map, false, param1);
@ -344,7 +344,7 @@ public int Handler_MapSelectMenu(Menu menu, MenuAction action, int param1, int p
case MenuAction_DrawItem: case MenuAction_DrawItem:
{ {
char map[64]; char map[PLATFORM_MAX_PATH];
menu.GetItem(param2, map, sizeof(map)); menu.GetItem(param2, map, sizeof(map));
int status; int status;
@ -366,7 +366,7 @@ public int Handler_MapSelectMenu(Menu menu, MenuAction action, int param1, int p
case MenuAction_DisplayItem: case MenuAction_DisplayItem:
{ {
char map[64]; char map[PLATFORM_MAX_PATH];
menu.GetItem(param2, map, sizeof(map)); menu.GetItem(param2, map, sizeof(map));
int status; int status;

2
plugins/playercommands/slap.sp
View File

@ -149,7 +149,7 @@ public MenuHandler_Slap(Menu menu, MenuAction action, int param1, int param2)
} }
else else
{ {
decl String:name[32]; decl String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
PerformSlap(param1, target, g_SlapDamage[param1]); PerformSlap(param1, target, g_SlapDamage[param1]);
ShowActivity2(param1, "[SM] ", "%t", "Slapped target", "_s", name); ShowActivity2(param1, "[SM] ", "%t", "Slapped target", "_s", name);

2
plugins/playercommands/slay.sp
View File

@ -103,7 +103,7 @@ public MenuHandler_Slay(Menu menu, MenuAction action, param1, param2)
} }
else else
{ {
decl String:name[32]; decl String:name[MAX_NAME_LENGTH];
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
PerformSlay(param1, target); PerformSlay(param1, target);
ShowActivity2(param1, "[SM] ", "%t", "Slayed target", "_s", name); ShowActivity2(param1, "[SM] ", "%t", "Slayed target", "_s", name);

2
plugins/rockthevote.sp
View File

@ -210,7 +210,7 @@ AttemptRTV(client)
return; return;
} }
new String:name[64]; new String:name[MAX_NAME_LENGTH];
GetClientName(client, name, sizeof(name)); GetClientName(client, name, sizeof(name));
g_Votes++; g_Votes++;