isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-19 22:01:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing some ubsan errors while walking around on the island (#194)

Browse Source 
* LegoMeterPresenter: use array deleter

* Avoid unaligned access in MxDSSelectionAction::Deserialize

* assert in LegoCarBUild::InitPresenter is BETA10-only

* clang-format
This commit is contained in:
Anonymous Maarten 2025-05-29 05:46:13 +02:00 committed by GitHub
parent ea7cac8359
commit e030ed739b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/build/legocarbuild.cpp
View File

@ -271,7 +271,9 @@ void LegoCarBuild::InitPresenters()
m_Decals_Ctl1 = (MxControlPresenter*) Find("MxControlPresenter", "Decals_Ctl1"); m_Decals_Ctl1 = (MxControlPresenter*) Find("MxControlPresenter", "Decals_Ctl1");
m_Decals_Ctl2 = (MxControlPresenter*) Find("MxControlPresenter", "Decals_Ctl2"); m_Decals_Ctl2 = (MxControlPresenter*) Find("MxControlPresenter", "Decals_Ctl2");
m_Decal_Bitmap = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); m_Decal_Bitmap = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
#ifdef BETA10
assert(m_Decal_Bitmap); assert(m_Decal_Bitmap);
#endif
if (m_Decal_Bitmap) { if (m_Decal_Bitmap) {
m_Decals_Ctl3 = (MxControlPresenter*) Find("MxControlPresenter", "Decals_Ctl3"); m_Decals_Ctl3 = (MxControlPresenter*) Find("MxControlPresenter", "Decals_Ctl3");
assert(m_Decals_Ctl3); assert(m_Decals_Ctl3);

2
LEGO1/lego/legoomni/src/control/legometerpresenter.cpp
View File

@ -28,7 +28,7 @@ LegoMeterPresenter::LegoMeterPresenter()
// FUNCTION: BETA10 0x1009764a // FUNCTION: BETA10 0x1009764a
LegoMeterPresenter::~LegoMeterPresenter() LegoMeterPresenter::~LegoMeterPresenter()
{ {
delete m_meterPixels; delete[] m_meterPixels;
} }
// FUNCTION: LEGO1 0x10043800 // FUNCTION: LEGO1 0x10043800

7
LEGO1/omni/src/action/mxdsselectaction.cpp
View File

@ -2,6 +2,7 @@
#include "mxmisc.h" #include "mxmisc.h"
#include "mxtimer.h" #include "mxtimer.h"
#include "mxutilities.h"
#include "mxvariabletable.h" #include "mxvariabletable.h"
#include <SDL3/SDL_stdinc.h> #include <SDL3/SDL_stdinc.h>
@ -100,7 +101,7 @@ void MxDSSelectAction::Deserialize(MxU8*& p_source, MxS16 p_flags)
MxString string; MxString string;
MxDSAction::Deserialize(p_source, p_flags); MxDSAction::Deserialize(p_source, p_flags);
MxU32 extraFlag = *(MxU32*) (p_source + 4) & 1; MxU32 extraFlag = UnalignedRead<MxU32>(p_source + 4) & 1;
p_source += 12; p_source += 12;
m_unk0x9c = (char*) p_source; m_unk0x9c = (char*) p_source;
@ -119,7 +120,7 @@ void MxDSSelectAction::Deserialize(MxU8*& p_source, MxS16 p_flags)
p_source += strlen((char*) p_source) + 1; p_source += strlen((char*) p_source) + 1;
MxU32 count = *(MxU32*) p_source; MxU32 count = UnalignedRead<MxU32>(p_source);
p_source += sizeof(MxU32); p_source += sizeof(MxU32);
if (count) { if (count) {
@ -137,7 +138,7 @@ void MxDSSelectAction::Deserialize(MxU8*& p_source, MxS16 p_flags)
} }
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
MxU32 extraFlag = *(MxU32*) (p_source + 4) & 1; MxU32 extraFlag = UnalignedRead<MxU32>(p_source + 4) & 1;
p_source += 8; p_source += 8;
action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_flags); action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_flags);