From 9c344ee225d5c8f0c42ff30a30e7681a07d853e6 Mon Sep 17 00:00:00 2001 From: rtldg <55846624+rtldg@users.noreply.github.com> Date: Tue, 3 Aug 2021 12:28:31 +0000 Subject: [PATCH] a few more mapname buffers adjusted to PLATFORM_MAX_PATH --- addons/sourcemod/scripting/shavit-rankings.sp | 6 +-- addons/sourcemod/scripting/shavit-replay.sp | 8 ++-- addons/sourcemod/scripting/shavit-wr.sp | 45 +++++++------------ 3 files changed, 23 insertions(+), 36 deletions(-) diff --git a/addons/sourcemod/scripting/shavit-rankings.sp b/addons/sourcemod/scripting/shavit-rankings.sp index 5454b45e..214b7173 100644 --- a/addons/sourcemod/scripting/shavit-rankings.sp +++ b/addons/sourcemod/scripting/shavit-rankings.sp @@ -181,7 +181,7 @@ public void OnPluginStart() HookEvent("player_team", Player_Event); // tier cache - gA_ValidMaps = new ArrayList(128); + gA_ValidMaps = new ArrayList(ByteCountToCells(PLATFORM_MAX_PATH)); gA_MapTiers = new StringMap(); if(gB_Late) @@ -444,8 +444,8 @@ public void SQL_FillTierCache_Callback(Database db, DBResultSet results, const c while(results.FetchRow()) { - char sMap[160]; - results.FetchString(0, sMap, 160); + char sMap[PLATFORM_MAX_PATH]; + results.FetchString(0, sMap, sizeof(sMap)); int tier = results.FetchInt(1); diff --git a/addons/sourcemod/scripting/shavit-replay.sp b/addons/sourcemod/scripting/shavit-replay.sp index dcc26462..278833a8 100644 --- a/addons/sourcemod/scripting/shavit-replay.sp +++ b/addons/sourcemod/scripting/shavit-replay.sp @@ -813,8 +813,8 @@ bool UnloadReplay(int style, int track, bool reload, bool restart, const char[] public int Native_DeleteReplay(Handle handler, int numParams) { - char sMap[160]; - GetNativeString(1, sMap, 160); + char sMap[PLATFORM_MAX_PATH]; + GetNativeString(1, sMap, sizeof(sMap)); int iStyle = GetNativeCell(2); int iTrack = GetNativeCell(3); @@ -1294,8 +1294,8 @@ public int Native_GetReplayButtons(Handle handler, int numParams) public int Native_Replay_DeleteMap(Handle handler, int numParams) { - char sMap[160]; - GetNativeString(1, sMap, 160); + char sMap[PLATFORM_MAX_PATH]; + GetNativeString(1, sMap, sizeof(sMap)); for(int i = 0; i < gI_Styles; i++) { diff --git a/addons/sourcemod/scripting/shavit-wr.sp b/addons/sourcemod/scripting/shavit-wr.sp index 7a30f62d..6d862e3c 100644 --- a/addons/sourcemod/scripting/shavit-wr.sp +++ b/addons/sourcemod/scripting/shavit-wr.sp @@ -186,7 +186,7 @@ public void OnPluginStart() gB_Stats = LibraryExists("shavit-stats"); // cache - gA_ValidMaps = new ArrayList(192); + gA_ValidMaps = new ArrayList(ByteCountToCells(PLATFORM_MAX_PATH)); if(gB_Late) { @@ -359,23 +359,13 @@ public void SQL_UpdateMaps_Callback(Database db, DBResultSet results, const char while(results.FetchRow()) { - char sMap[192]; - results.FetchString(0, sMap, 192); + char sMap[PLATFORM_MAX_PATH]; + results.FetchString(0, sMap, sizeof(sMap)); + LowercaseString(sMap); - char sLowerCase[128]; - strcopy(sLowerCase, 128, sMap); - - for(int i = 0; i < strlen(sLowerCase); i++) + if(gA_ValidMaps.FindString(sMap) == -1) { - if(!IsCharUpper(sLowerCase[i])) - { - sLowerCase[i] = CharToLower(sLowerCase[i]); - } - } - - if(gA_ValidMaps.FindString(sLowerCase) == -1) - { - gA_ValidMaps.PushString(sLowerCase); + gA_ValidMaps.PushString(sMap); } } @@ -1346,8 +1336,8 @@ public void GetRecordDetails_Callback(Database db, DBResultSet results, const ch char sName[MAX_NAME_LENGTH]; results.FetchString(1, sName, MAX_NAME_LENGTH); - char sMap[160]; - results.FetchString(2, sMap, 160); + char sMap[PLATFORM_MAX_PATH]; + results.FetchString(2, sMap, sizeof(sMap)); float fTime = results.FetchFloat(3); float fSync = results.FetchFloat(4); @@ -1399,8 +1389,8 @@ public void DeleteConfirm_Callback(Database db, DBResultSet results, const char[ char sName[MAX_NAME_LENGTH]; hPack.ReadString(sName, MAX_NAME_LENGTH); - char sMap[160]; - hPack.ReadString(sMap, 160); + char sMap[PLATFORM_MAX_PATH]; + hPack.ReadString(sMap, sizeof(sMap)); float fTime = view_as(hPack.ReadCell()); float fSync = view_as(hPack.ReadCell()); @@ -1501,7 +1491,6 @@ public Action Command_WorldRecord(int client, int args) track = Track_Bonus; } } - else { havemap = (args >= 1); @@ -1691,8 +1680,8 @@ public void SQL_WR_Callback(Database db, DBResultSet results, const char[] error int serial = data.ReadCell(); int track = data.ReadCell(); - char sMap[192]; - data.ReadString(sMap, 192); + char sMap[PLATFORM_MAX_PATH]; + data.ReadString(sMap, sizeof(sMap)); delete data; @@ -1867,9 +1856,8 @@ public void SQL_RR_Callback(Database db, DBResultSet results, const char[] error while(results.FetchRow()) { - char sMap[192]; - results.FetchString(1, sMap, 192); - + char sMap[PLATFORM_MAX_PATH]; + results.FetchString(1, sMap, sizeof(sMap)); char sName[MAX_NAME_LENGTH]; results.FetchString(2, sName, 10); @@ -1987,7 +1975,7 @@ public void SQL_SubMenu_Callback(Database db, DBResultSet results, const char[] char sName[MAX_NAME_LENGTH]; int iSteamID = 0; char sTrack[32]; - char sMap[192]; + char sMap[PLATFORM_MAX_PATH]; for (int i = 0; i < gI_Styles; i++) { @@ -2030,8 +2018,7 @@ public void SQL_SubMenu_Callback(Database db, DBResultSet results, const char[] FormatEx(sDisplay, 128, "%T: %s", "WRStyle", client, gS_StyleStrings[iStyle].sStyleName); hMenu.AddItem("-1", sDisplay); - results.FetchString(6, sMap, 192); - + results.FetchString(6, sMap, sizeof(sMap)); float fPoints = results.FetchFloat(10);