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

CGameArea: Remove undefined behavior type-punning in a few functions 

We can make use of std::memcpy here to get around this.
This commit is contained in:
Lioncash 2020-04-23 03:00:38 -04:00
parent df3aed75fe
commit eefeb5cd0b
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Runtime/World/CGameArea.cpp
View File

@ -1,6 +1,7 @@
#include "Runtime/World/CGameArea.hpp" #include "Runtime/World/CGameArea.hpp"
#include <array> #include <array>
#include <cstring>
#include "Runtime/CGameState.hpp" #include "Runtime/CGameState.hpp"
#include "Runtime/CSimplePool.hpp" #include "Runtime/CSimplePool.hpp"
@ -247,22 +248,27 @@ static std::vector<SObjectTag> ReadDependencyList(CInputStream& in) {
} }
std::pair<std::unique_ptr<u8[]>, s32> GetScriptingMemoryAlways(const IGameArea& area) { std::pair<std::unique_ptr<u8[]>, s32> GetScriptingMemoryAlways(const IGameArea& area) {
SObjectTag tag = {SBIG('MREA'), area.IGetAreaAssetId()}; const SObjectTag tag = {SBIG('MREA'), area.IGetAreaAssetId()};
std::unique_ptr<u8[]> data = g_ResFactory->LoadNewResourcePartSync(tag, 0, 96); std::unique_ptr<u8[]> data = g_ResFactory->LoadNewResourcePartSync(tag, 0, 96);
if (*reinterpret_cast<u32*>(data.get()) != SBIG(0xDEADBEEF)) u32 magic{};
std::memcpy(&magic, data.get(), sizeof(u32));
if (magic != SBIG(0xDEADBEEF)) {
return {}; return {};
}
SMREAHeader header;
CMemoryInStream r(data.get() + 4, 96 - 4); CMemoryInStream r(data.get() + 4, 96 - 4);
u32 version = r.readUint32Big(); u32 version = r.readUint32Big();
if (!(version & 0x10000)) if ((version & 0x10000) == 0) {
Log.report(logvisor::Fatal, FMT_STRING("Attempted to load non-URDE MREA")); Log.report(logvisor::Fatal, FMT_STRING("Attempted to load non-URDE MREA"));
}
version &= ~0x10000; version &= ~0x10000;
SMREAHeader header;
header.version = (version >= 12 && version <= 15) ? version : 0; header.version = (version >= 12 && version <= 15) ? version : 0;
if (!header.version) if (!header.version) {
return {}; return {};
}
header.xf.read34RowMajor(r); header.xf.read34RowMajor(r);
header.modelCount = r.readUint32Big(); header.modelCount = r.readUint32Big();
@ -743,7 +749,9 @@ bool CGameArea::StartStreamingMainArea() {
void CGameArea::ReloadAllUnloadedTextures() {} void CGameArea::ReloadAllUnloadedTextures() {}
u32 CGameArea::GetNumPartSizes() const { u32 CGameArea::GetNumPartSizes() const {
return hecl::SBig(*reinterpret_cast<u32*>(x110_mreaSecBufs[0].first.get() + 60)); u32 value{};
std::memcpy(&value, x110_mreaSecBufs[0].first.get() + 60, sizeof(u32));
return hecl::SBig(value);
} }
void CGameArea::AllocNewAreaData(int offset, int size) { void CGameArea::AllocNewAreaData(int offset, int size) {
@ -1135,20 +1143,28 @@ void CGameArea::ClearTokenList() {
u32 CGameArea::GetPreConstructedSize() const { return 0; } u32 CGameArea::GetPreConstructedSize() const { return 0; }
SMREAHeader CGameArea::VerifyHeader() const { SMREAHeader CGameArea::VerifyHeader() const {
if (x110_mreaSecBufs.empty()) if (x110_mreaSecBufs.empty()) {
return {};
if (*reinterpret_cast<u32*>(x110_mreaSecBufs[0].first.get()) != SBIG(0xDEADBEEF))
return {}; return {};
}
u32 magic{};
std::memcpy(&magic, x110_mreaSecBufs[0].first.get(), sizeof(u32));
if (magic != SBIG(0xDEADBEEF)) {
return {};
}
SMREAHeader header;
CMemoryInStream r(x110_mreaSecBufs[0].first.get() + 4, x110_mreaSecBufs[0].second - 4); CMemoryInStream r(x110_mreaSecBufs[0].first.get() + 4, x110_mreaSecBufs[0].second - 4);
u32 version = r.readUint32Big(); u32 version = r.readUint32Big();
if (!(version & 0x10000)) if ((version & 0x10000) == 0) {
Log.report(logvisor::Fatal, FMT_STRING("Attempted to load non-URDE MREA")); Log.report(logvisor::Fatal, FMT_STRING("Attempted to load non-URDE MREA"));
}
version &= ~0x10000; version &= ~0x10000;
SMREAHeader header;
header.version = (version >= 12 && version <= 15) ? version : 0; header.version = (version >= 12 && version <= 15) ? version : 0;
if (!header.version) if (!header.version) {
return {}; return {};
}
header.xf.read34RowMajor(r); header.xf.read34RowMajor(r);
header.modelCount = r.readUint32Big(); header.modelCount = r.readUint32Big();