immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CBotUT.TestSaveStateIOFunctions 

Fail occurred due to wrong read of min double.
`unsigned long` has been changed in Write/ReadDouble functions to
`uint64_t`.
`unsigned int` has been changed in Write/ReadFloat functions to
`uint32_t`.

According to the standard
`int` is at least 16-bit so it might be too small for 32-bit `float`,
`long` is at least 32-bit so it might be too small for 64-bit `double`,
and `long long` is at least 64-bit.
fix-squashed-planets
MrSimbax 2021-12-05 12:12:00 +01:00 committed by Mateusz Przybył
parent 3aa7c3c2e0
commit 9fd935770a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/CBot/CBotFileUtils.cpp
View File

@ -186,7 +186,7 @@ bool WriteFloat(std::ostream &ostr, float f)
union TypeConverter union TypeConverter
{ {
float fValue; float fValue;
unsigned int iValue; uint32_t iValue;
}; };
TypeConverter u; TypeConverter u;
@ -194,7 +194,7 @@ bool WriteFloat(std::ostream &ostr, float f)
u.iValue = 0; u.iValue = 0;
u.fValue = f; u.fValue = f;
return WriteBinary<unsigned int>(ostr, u.iValue); return WriteBinary<uint32_t>(ostr, u.iValue);
} }
bool ReadFloat(std::istream &istr, float &f) bool ReadFloat(std::istream &istr, float &f)
@ -202,14 +202,14 @@ bool ReadFloat(std::istream &istr, float &f)
union TypeConverter union TypeConverter
{ {
float fValue; float fValue;
unsigned int iValue; uint32_t iValue;
}; };
TypeConverter u; TypeConverter u;
u.fValue = 0.0f; u.fValue = 0.0f;
u.iValue = 0; u.iValue = 0;
if (!ReadBinary<unsigned int>(istr, u.iValue)) return false; if (!ReadBinary<uint32_t>(istr, u.iValue)) return false;
f = u.fValue; f = u.fValue;
return true; return true;
} }
@ -219,7 +219,7 @@ bool WriteDouble(std::ostream &ostr, double d)
union TypeConverter union TypeConverter
{ {
double dValue; double dValue;
unsigned long iValue; uint64_t iValue;
}; };
TypeConverter u; TypeConverter u;
@ -227,7 +227,7 @@ bool WriteDouble(std::ostream &ostr, double d)
u.iValue = 0; u.iValue = 0;
u.dValue = d; u.dValue = d;
return WriteBinary<unsigned long>(ostr, u.iValue); return WriteBinary<uint64_t>(ostr, u.iValue);
} }
bool ReadDouble(std::istream &istr, double &d) bool ReadDouble(std::istream &istr, double &d)
@ -235,14 +235,14 @@ bool ReadDouble(std::istream &istr, double &d)
union TypeConverter union TypeConverter
{ {
double dValue; double dValue;
unsigned long iValue; uint64_t iValue;
}; };
TypeConverter u; TypeConverter u;
u.dValue = 0.0; u.dValue = 0.0;
u.iValue = 0; u.iValue = 0;
if (!ReadBinary<unsigned long>(istr, u.iValue)) return false; if (!ReadBinary<uint64_t>(istr, u.iValue)) return false;
d = u.dValue; d = u.dValue;
return true; return true;
} }