mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix std:clamp usage

Browse source 
We appear to consistently assume that clamp can be called with 0, size as
interval, but that actually results in a possible out of bounds access at the
upper end.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2025-01-10 15:44:49 -08:00 • committed by Michael Keller
parent bbff369bf2
commit 5671a634a8
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mobile-widgets/statsmanager.cpp
View file

@ -81,7 +81,7 @@ void StatsManager::var1Changed(int idx)
{
if (uiState.var1.variables.empty())
return;
idx = std::clamp(idx, 0, (int)uiState.var1.variables.size());
idx = std::clamp(idx, 0, (int)uiState.var1.variables.size() - 1);
state.var1Changed(uiState.var1.variables[idx].id);
updateUi();
}
@ -96,7 +96,7 @@ void StatsManager::var2Changed(int idx)
{
if (uiState.var2.variables.empty())
return;
idx = std::clamp(idx, 0, (int)uiState.var2.variables.size());
idx = std::clamp(idx, 0, (int)uiState.var2.variables.size() - 1);
state.var2Changed(uiState.var2.variables[idx].id);
updateUi();
}
@ -111,7 +111,7 @@ void StatsManager::var2OperationChanged(int idx)
{
if (uiState.operations2.variables.empty())
return;
idx = std::clamp(idx, 0, (int)uiState.operations2.variables.size());
idx = std::clamp(idx, 0, (int)uiState.operations2.variables.size() - 1);
state.var2OperationChanged(uiState.operations2.variables[idx].id);
updateUi();
}
@ -120,7 +120,7 @@ void StatsManager::sortMode1Changed(int idx)
{
if (uiState.sortMode1.variables.empty())
return;
idx = std::clamp(idx, 0, (int)uiState.sortMode1.variables.size());
idx = std::clamp(idx, 0, (int)uiState.sortMode1.variables.size() - 1);
state.sortMode1Changed(uiState.sortMode1.variables[idx].id);
updateUi();
}