Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Safer clans (#366)

Browse Source 
* Safer clans

* Remove pointer check

Co-authored-by: Louvenarde <louve@louve.systems>
This commit is contained in:
Louve 2022-07-18 23:29:34 +02:00 committed by GitHub
parent 1679f1bb4b
commit 63ce4095e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Components/Modules/ClanTags.cpp
View File

@ -74,6 +74,8 @@ namespace Components
std::memset(saneNameBuf, 0, sizeof(saneNameBuf)); std::memset(saneNameBuf, 0, sizeof(saneNameBuf));
auto* saneName = saneNameBuf; auto* saneName = saneNameBuf;
assert(ClanName);
const auto* currentName = ClanName->current.string; const auto* currentName = ClanName->current.string;
if (currentName) if (currentName)
{ {
@ -95,9 +97,10 @@ namespace Components
char* ClanTags::GamerProfile_GetClanName(int controllerIndex) char* ClanTags::GamerProfile_GetClanName(int controllerIndex)
{ {
assert(static_cast<std::size_t>(controllerIndex) < Game::MAX_LOCAL_CLIENTS); assert(static_cast<std::size_t>(controllerIndex) < Game::MAX_LOCAL_CLIENTS);
assert(ClanName);
CL_SanitizeClanName(); CL_SanitizeClanName();
Game::I_strncpyz(Game::gamerSettings[0].exeConfig.clanPrefix, ClanName->current.string, sizeof(Game::GamerSettingExeConfig::clanPrefix)); Game::I_strncpyz(Game::gamerSettings[controllerIndex].exeConfig.clanPrefix, ClanName->current.string, sizeof(Game::GamerSettingExeConfig::clanPrefix));
return Game::gamerSettings[controllerIndex].exeConfig.clanPrefix; return Game::gamerSettings[controllerIndex].exeConfig.clanPrefix;
} }
@ -237,11 +240,11 @@ namespace Components
ClanTags::ClanTags() ClanTags::ClanTags()
{ {
Scheduler::Once([] Events::OnClientInit([]
{ {
ClanName = Game::Dvar_RegisterString("clanName", "", Game::DVAR_ARCHIVE, ClanName = Game::Dvar_RegisterString("clanName", "", Game::DVAR_ARCHIVE,
"Your clan abbreviation"); "Your clan abbreviation");
}, Scheduler::Pipeline::MAIN); });
std::memset(&ClientState, 0, sizeof(char[Game::MAX_CLIENTS][5])); std::memset(&ClientState, 0, sizeof(char[Game::MAX_CLIENTS][5]));