mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-19 16:21:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_ub' into 'master'

Browse Source 
Fix UB: reference binding to misaligned address in Lua tests

See merge request OpenMW/openmw!1025
This commit is contained in:
jvoisin 2021-07-18 09:31:48 +00:00
commit e5dc8e1ec9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw_test_suite/lua/test_serialization.cpp
View File

@ -163,7 +163,8 @@ namespace
{ {
if (sizeof(TestStruct1) != binaryData.size()) if (sizeof(TestStruct1) != binaryData.size())
throw std::runtime_error("Incorrect binaryData.size() for TestStruct1: " + std::to_string(binaryData.size())); throw std::runtime_error("Incorrect binaryData.size() for TestStruct1: " + std::to_string(binaryData.size()));
TestStruct1 t = *reinterpret_cast<const TestStruct1*>(binaryData.data()); TestStruct1 t;
std::memcpy(&t, binaryData.data(), sizeof(t));
t.a = Misc::fromLittleEndian(t.a); t.a = Misc::fromLittleEndian(t.a);
t.b = Misc::fromLittleEndian(t.b); t.b = Misc::fromLittleEndian(t.b);
sol::stack::push<TestStruct1>(lua, t); sol::stack::push<TestStruct1>(lua, t);
@ -173,7 +174,8 @@ namespace
{ {
if (sizeof(TestStruct2) != binaryData.size()) if (sizeof(TestStruct2) != binaryData.size())
throw std::runtime_error("Incorrect binaryData.size() for TestStruct2: " + std::to_string(binaryData.size())); throw std::runtime_error("Incorrect binaryData.size() for TestStruct2: " + std::to_string(binaryData.size()));
TestStruct2 t = *reinterpret_cast<const TestStruct2*>(binaryData.data()); TestStruct2 t;
std::memcpy(&t, binaryData.data(), sizeof(t));
t.a = Misc::fromLittleEndian(t.a); t.a = Misc::fromLittleEndian(t.a);
t.b = Misc::fromLittleEndian(t.b); t.b = Misc::fromLittleEndian(t.b);
sol::stack::push<TestStruct2>(lua, t); sol::stack::push<TestStruct2>(lua, t);