matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix OOB read when parsing empty string as float

Browse Source 
I really don't like how the only way to return with an error from ParseFloatProperty is via an exception >_>

Also do a range check on airTemp only if isValid is true, otherwise it's uninitialized.
This commit is contained in:
Tamás Bálint Misius 2022-10-06 19:25:41 +02:00
parent a8d2b269b1
commit d75e4ccb2e
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/game/PropertyTool.cpp
View File

@ -25,6 +25,10 @@
void ParseFloatProperty(String value, float &out) void ParseFloatProperty(String value, float &out)
{ {
if (!value.size())
{
throw std::out_of_range("empty string");
}
if (value.EndsWith("C")) if (value.EndsWith("C"))
{ {
float v = value.SubstrFromEnd(1).ToNumber<float>(); float v = value.SubstrFromEnd(1).ToNumber<float>();

2
src/gui/options/OptionsView.cpp
View File

@ -476,7 +476,7 @@ void OptionsView::UpdateAirTemp(String temp, bool isDefocus)
ambientAirTemp->SetText(sb.Build()); ambientAirTemp->SetText(sb.Build());
} }
// Out of range temperatures are invalid, preview should go away // Out of range temperatures are invalid, preview should go away
else if (airTemp < MIN_TEMP || airTemp > MAX_TEMP) else if (isValid && (airTemp < MIN_TEMP || airTemp > MAX_TEMP))
isValid = false; isValid = false;
// If valid, set temp // If valid, set temp