mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-01 06:00:15 +02:00
Code Issues Projects Releases Wiki Activity

Fix crashes when giving !set invalid property values

Browse Source 
This fixes two kinds of crashes: the one where the value passed is not possible to convert at all to the type of value expected (e.g. expect unsigned integer, get point), and also when it is possible, because the difference is only in signedness (e.g. expect unsigned integer, get signed integer). Both cases crash since 8552aafbce, where the handling of the former case got removed and accidentally never got added back, and the handling of the latter changed from converting everything to strings and working from there to converting directly between floats and numbers, disregarding signedness.
This commit is contained in:
Tamás Bálint Misius
2024-12-07 00:09:33 +01:00
parent 639504ab23
commit 5454ef892d
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lua/CommandInterface.cpp
View File

@@ -361,6 +361,7 @@ AnyType CommandInterface::tptS_set(std::deque<String> * words)
}
auto &propInfo = Particle::GetProperties()[*prop];
// assume that value can be anything
if (value.GetType() == TypeNumber && propInfo.Type == StructProperty::Float)
{
value = FloatType(NumberType(value).Value());
@@ -369,27 +370,38 @@ AnyType CommandInterface::tptS_set(std::deque<String> * words)
{
value = NumberType(FloatType(value).Value());
}
// value can still be almost anything, but if it was NumberType or FloatType,
// at least it now matches the float-ness, if not the signedness, of prop
AccessProperty changeProperty;
try
{
switch (value.GetType())
{
case TypeNumber:
// get a number (an int) => take an int
changeProperty.propertyIndex = *prop;
changeProperty.propertyValue = NumberType(value).Value();
if (propInfo.Type == StructProperty::UInteger)
{
// actually want an unsigned int => convert the int taken to one
changeProperty.propertyValue = static_cast<unsigned int>(std::get<int>(changeProperty.propertyValue));
}
break;
case TypeFloat:
// get a float => take a float
changeProperty.propertyIndex = *prop;
changeProperty.propertyValue = FloatType(value).Value();
break;
case TypeString:
// AccessProperty::Parse returns the appropriate variant
changeProperty = AccessProperty::Parse(*prop, StringType(value).Value());
break;
default:
break;
// get something else => bail
throw GeneralException("Invalid property value");
}
}
catch (const AccessProperty::ParseError &ex)