AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Only use actual regex matches to avoid

This commit is contained in:
Phillip Stephens 2021-06-02 06:16:27 -07:00
parent 65c989d463
commit 561e54527b
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hecl/lib/CVarManager.cpp
View File

@ -18,7 +18,7 @@ CVar* com_configfile = nullptr;
CVar* com_enableCheats = nullptr; CVar* com_enableCheats = nullptr;
CVar* com_cubemaps = nullptr; CVar* com_cubemaps = nullptr;
static const std::regex cmdLineRegex(R"(\+([\w\.]+)([=])?([\"\/\\\s\w\.\-]+)?)"); static const std::regex cmdLineRegex(R"(\+([\w\.]+)([=])?([\/\\\s\w\.\-]+)?)");
CVarManager* CVarManager::m_instance = nullptr; CVarManager* CVarManager::m_instance = nullptr;
static logvisor::Module CVarLog("CVarManager"); static logvisor::Module CVarLog("CVarManager");
@ -312,9 +312,15 @@ void CVarManager::parseCommandLine(const std::vector<SystemString>& args) {
std::string cvarValue; std::string cvarValue;
if (std::regex_match(tmp, matches, cmdLineRegex)) { if (std::regex_match(tmp, matches, cmdLineRegex)) {
if (matches.size() == 3) { std::vector<std::string> realMatches;
for (auto match : matches) {
if (match.matched) {
realMatches.push_back(match);
}
}
if (realMatches.size() == 2) {
cvarName = matches[1].str(); cvarName = matches[1].str();
} else if (matches.size() == 4) { } else if (realMatches.size() == 4) {
cvarName = matches[1].str(); cvarName = matches[1].str();
cvarValue = matches[3].str(); cvarValue = matches[3].str();
} }