mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-19 10:23:15 +00:00
Code Issues Releases Wiki Activity

Prevent UB when reading global variables

Browse source
This commit is contained in:
Evil Eye 2025-12-01 20:58:25 +01:00
parent 3c3fdda8a0
commit be73f2b019
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
components/esm3/variantimp.cpp
View file

@ -1,6 +1,7 @@
#include "variantimp.hpp" #include "variantimp.hpp"
#include <cmath> #include <cmath>
#include <limits>
#include <sstream> #include <sstream>
#include <stdexcept> #include <stdexcept>
@ -9,6 +10,18 @@
namespace ESM namespace ESM
{ {
namespace
{
template <class T>
T floatCast(float value)
{
constexpr float min = static_cast<float>(std::numeric_limits<T>::lowest());
constexpr float max = static_cast<float>(std::numeric_limits<T>::max());
if (std::isnan(value) || value < min || value > max)
return {};
return static_cast<T>(value);
}
}
void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, std::string& out) void readESMVariantValue(ESMReader& esm, Variant::Format format, VarType type, std::string& out)
{ {
@ -60,9 +73,9 @@ namespace ESM
if (std::isnan(value)) if (std::isnan(value))
out = 0; out = 0;
else else
out = static_cast<int16_t>(value); out = floatCast<int16_t>(value);
else if (type == VT_Long) else if (type == VT_Long)
out = static_cast<int32_t>(value); out = floatCast<int32_t>(value);
else else
esm.fail("unsupported global variable integer type"); esm.fail("unsupported global variable integer type");
} }