AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CMapArea: Remove type-punning undefined behavior within PostConstruct() 

Casting up from unsigned char or char to an unrelated type isn't
permitted by the C++ standard in the manner it's currently being done.

We can utilize std::memcpy to mitigate this.
This commit is contained in:
Lioncash 2020-03-17 19:20:34 -04:00
parent 6ddbd15cfc
commit b570168359
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/AutoMapper/CMapArea.cpp
View File

@ -36,8 +36,14 @@ void CMapArea::PostConstruct() {
u8* tmp = x3c_vertexStart; u8* tmp = x3c_vertexStart;
m_verts.reserve(x2c_vertexCount); m_verts.reserve(x2c_vertexCount);
for (u32 i = 0; i < x2c_vertexCount; ++i) { for (u32 i = 0; i < x2c_vertexCount; ++i) {
float* fl = reinterpret_cast<float*>(tmp); float x;
m_verts.emplace_back(hecl::SBig(fl[0]), hecl::SBig(fl[1]), hecl::SBig(fl[2])); std::memcpy(&x, tmp, sizeof(float));
float y;
std::memcpy(&y, tmp + 4, sizeof(float));
float z;
std::memcpy(&z, tmp + 8, sizeof(float));
m_verts.emplace_back(hecl::SBig(x), hecl::SBig(y), hecl::SBig(z));
tmp += 12; tmp += 12;
} }