hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-12-24 17:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

config: fix crash when some configurations include non-integer values (#12056)

Browse source
This commit is contained in:
Matteo Golinelli 2025-10-16 15:33:06 +02:00 • committed by GitHub
parent 36c0477dd0
commit 8164b90bc2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/config/ConfigManager.cpp
View file

@ -1102,7 +1102,9 @@ std::optional<std::string> CConfigManager::handleMonitorv2(const std::string& ou
VAL = m_config->getSpecialConfigValuePtr("monitorv2", "addreserved", output.c_str()); VAL = m_config->getSpecialConfigValuePtr("monitorv2", "addreserved", output.c_str());
if (VAL && VAL->m_bSetByUser) { if (VAL && VAL->m_bSetByUser) {
const auto ARGS = CVarList(std::any_cast<Hyprlang::STRING>(VAL->getValue())); const auto ARGS = CVarList(std::any_cast<Hyprlang::STRING>(VAL->getValue()));
parser.setReserved({.top = std::stoi(ARGS[0]), .bottom = std::stoi(ARGS[1]), .left = std::stoi(ARGS[2]), .right = std::stoi(ARGS[3])}); try {
parser.setReserved({.top = std::stoi(ARGS[0]), .bottom = std::stoi(ARGS[1]), .left = std::stoi(ARGS[2]), .right = std::stoi(ARGS[3])});
} catch (...) { return "parse error: invalid reserved area"; }
} }
VAL = m_config->getSpecialConfigValuePtr("monitorv2", "mirror", output.c_str()); VAL = m_config->getSpecialConfigValuePtr("monitorv2", "mirror", output.c_str());
if (VAL && VAL->m_bSetByUser) if (VAL && VAL->m_bSetByUser)
@ -2084,17 +2086,22 @@ static bool parseModeLine(const std::string& modeline, drmModeModeInfo& mode) {
int argno = 1; int argno = 1;
mode.type = DRM_MODE_TYPE_USERDEF; try {
mode.clock = std::stof(args[argno++]) * 1000; mode.type = DRM_MODE_TYPE_USERDEF;
mode.hdisplay = std::stoi(args[argno++]); mode.clock = std::stof(args[argno++]) * 1000;
mode.hsync_start = std::stoi(args[argno++]); mode.hdisplay = std::stoi(args[argno++]);
mode.hsync_end = std::stoi(args[argno++]); mode.hsync_start = std::stoi(args[argno++]);
mode.htotal = std::stoi(args[argno++]); mode.hsync_end = std::stoi(args[argno++]);
mode.vdisplay = std::stoi(args[argno++]); mode.htotal = std::stoi(args[argno++]);
mode.vsync_start = std::stoi(args[argno++]); mode.vdisplay = std::stoi(args[argno++]);
mode.vsync_end = std::stoi(args[argno++]); mode.vsync_start = std::stoi(args[argno++]);
mode.vtotal = std::stoi(args[argno++]); mode.vsync_end = std::stoi(args[argno++]);
mode.vrefresh = mode.clock * 1000.0 * 1000.0 / mode.htotal / mode.vtotal; mode.vtotal = std::stoi(args[argno++]);
mode.vrefresh = mode.clock * 1000.0 * 1000.0 / mode.htotal / mode.vtotal;
} catch (const std::exception& e) {
Debug::log(ERR, "modeline parse error: invalid numeric value: {}", e.what());
return false;
}
// clang-format off // clang-format off
static std::unordered_map<std::string, uint32_t> flagsmap = { static std::unordered_map<std::string, uint32_t> flagsmap = {
@ -2245,6 +2252,11 @@ bool CMonitorRuleParser::parseScale(const std::string& value) {
} }
bool CMonitorRuleParser::parseTransform(const std::string& value) { bool CMonitorRuleParser::parseTransform(const std::string& value) {
if (!isNumber(value)) {
m_error += "invalid transform ";
return false;
}
const auto TSF = std::stoi(value); const auto TSF = std::stoi(value);
if (std::clamp(TSF, 0, 7) != TSF) { if (std::clamp(TSF, 0, 7) != TSF) {
Debug::log(ERR, "Invalid transform {} in monitor", TSF); Debug::log(ERR, "Invalid transform {} in monitor", TSF);
@ -2355,7 +2367,9 @@ std::optional<std::string> CConfigManager::handleMonitor(const std::string& comm
return {}; return {};
} else if (ARGS[1] == "addreserved") { } else if (ARGS[1] == "addreserved") {
parser.setReserved({.top = std::stoi(ARGS[2]), .bottom = std::stoi(ARGS[3]), .left = std::stoi(ARGS[4]), .right = std::stoi(ARGS[5])}); try {
parser.setReserved({.top = std::stoi(ARGS[2]), .bottom = std::stoi(ARGS[3]), .left = std::stoi(ARGS[4]), .right = std::stoi(ARGS[5])});
} catch (...) { return "parse error: invalid reserved area"; }
return {}; return {};
} else { } else {
Debug::log(ERR, "ConfigManager parseMonitor, curitem bogus???"); Debug::log(ERR, "ConfigManager parseMonitor, curitem bogus???");
@ -2432,18 +2446,26 @@ std::optional<std::string> CConfigManager::handleBezier(const std::string& comma
if (ARGS[1].empty()) if (ARGS[1].empty())
return "too few arguments"; return "too few arguments";
else if (!isNumber(ARGS[1], true))
return "invalid point";
float p1x = std::stof(ARGS[1]); float p1x = std::stof(ARGS[1]);
if (ARGS[2].empty()) if (ARGS[2].empty())
return "too few arguments"; return "too few arguments";
else if (!isNumber(ARGS[2], true))
return "invalid point";
float p1y = std::stof(ARGS[2]); float p1y = std::stof(ARGS[2]);
if (ARGS[3].empty()) if (ARGS[3].empty())
return "too few arguments"; return "too few arguments";
else if (!isNumber(ARGS[3], true))
return "invalid point";
float p2x = std::stof(ARGS[3]); float p2x = std::stof(ARGS[3]);
if (ARGS[4].empty()) if (ARGS[4].empty())
return "too few arguments"; return "too few arguments";
else if (!isNumber(ARGS[4], true))
return "invalid point";
float p2y = std::stof(ARGS[4]); float p2y = std::stof(ARGS[4]);
if (!ARGS[5].empty()) if (!ARGS[5].empty())