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

[General]: Add size check to execute func (#827)

Browse Source
This commit is contained in:
Edo 2023-03-11 12:35:03 +00:00 committed by GitHub
parent b44aa534dc
commit 5f33db9ed6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Components/Modules/Command.cpp
View File

@ -85,11 +85,9 @@ namespace Components
if (Loader::IsPregame())
{
MessageBoxA(nullptr, "Registering server commands in pregame state is illegal!", nullptr, MB_ICONERROR);
#ifdef _DEBUG
__debugbreak();
#endif
return;
}
@ -120,6 +118,8 @@ namespace Components
{
command.append("\n"); // Make sure it's terminated
assert(command.size() < Game::MAX_CMD_LINE);
if (sync)
{
Game::Cmd_ExecuteSingleCommand(0, 0, command.data());
@ -134,9 +134,9 @@ namespace Components
{
auto* cmdFunction = *Game::cmd_functions;
while (cmdFunction != nullptr)
while (cmdFunction)
{
if (cmdFunction->name != nullptr && cmdFunction->name == command)
if (cmdFunction->name && Utils::String::Compare(cmdFunction->name, command))
{
return cmdFunction;
}
@ -174,18 +174,6 @@ namespace Components
}
}
bool Command::IsSendingNotifiesDisabled()
{
static std::optional<bool> flag;
if (!flag.has_value())
{
flag.emplace(Flags::HasFlag("disable-notifies"));
}
return flag.value();
}
const std::vector<std::string>& Command::GetExceptions()
{
static const auto exceptions = []() -> std::vector<std::string>
@ -197,7 +185,7 @@ namespace Components
"map",
};
if (IsSendingNotifiesDisabled())
if (Flags::HasFlag("disable-notifies"))
{
values.emplace_back("vstr");
values.emplace_back("wait");
@ -219,7 +207,7 @@ namespace Components
const auto& exceptions = GetExceptions();
for (const auto& entry : exceptions)
{
if (!_stricmp(cmd, entry.data()))
if (Utils::String::Compare(cmd, entry))
{
return false;
}

1
src/Components/Modules/Command.hpp
View File

@ -73,7 +73,6 @@ namespace Components
static void MainCallback();
static void MainCallbackSV();
static bool IsSendingNotifiesDisabled();
static const std::vector<std::string>& GetExceptions();
static bool CL_ShouldSendNotify_Hk(const char* cmd);
};

2
src/Components/Modules/Dvar.cpp
View File

@ -257,7 +257,7 @@ namespace Components
void Dvar::SetFromStringByNameSafeExternal(const char* dvarName, const char* string)
{
static std::array<const char*, 8> exceptions =
static std::array exceptions =
{
"ui_showEndOfGame",
"systemlink",

2
src/Game/Functions.hpp
View File

@ -585,6 +585,8 @@ namespace Game
constexpr std::size_t MAX_LOCAL_CLIENTS = 1;
constexpr std::size_t MAX_CLIENTS = 18;
constexpr auto MAX_CMD_BUFFER = 0x10000;
constexpr auto MAX_CMD_LINE = 0x1000;
constexpr auto CMD_MAX_NESTING = 8;
extern CmdArgs* cmd_args;
extern CmdArgs* sv_cmd_args;