hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-02 18:26:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

configmanager: set a limit to config variable substitutions

Browse source 
fixes #4198
This commit is contained in:
Vaxry 2023-12-20 13:07:12 +01:00
parent d1b8a63a8e
commit b4f4bd38e8
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/config/ConfigManager.cpp
View file

@ -1478,7 +1478,10 @@ std::string CConfigManager::parseKeyword(const std::string& COMMAND, const std::
void CConfigManager::applyUserDefinedVars(std::string& line, const size_t equalsPlace) { void CConfigManager::applyUserDefinedVars(std::string& line, const size_t equalsPlace) {
auto dollarPlace = line.find_first_of('$', equalsPlace); auto dollarPlace = line.find_first_of('$', equalsPlace);
int times = 0;
while (dollarPlace != std::string::npos) { while (dollarPlace != std::string::npos) {
times++;
const auto STRAFTERDOLLAR = line.substr(dollarPlace + 1); const auto STRAFTERDOLLAR = line.substr(dollarPlace + 1);
bool found = false; bool found = false;
@ -1501,6 +1504,13 @@ void CConfigManager::applyUserDefinedVars(std::string& line, const size_t equals
} }
dollarPlace = line.find_first_of('$', dollarPlace + 1); dollarPlace = line.find_first_of('$', dollarPlace + 1);
if (times > 256 /* arbitrary limit */) {
line = "";
parseError = "Maximum variable recursion limit hit. Evaluating the line led to too many variable substitutions.";
Debug::log(ERR, "Variable recursion limit hit in configmanager");
break;
}
} }
} }