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

Avoid unaligned access in MxDSSelectionAction::Deserialize

Browse Source
This commit is contained in:
Anonymous Maarten 2025-05-29 05:15:27 +02:00
parent 0897f75c7c
commit 6d69514eac
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
#include "mxdsselectaction.h" #include "mxdsselectaction.h"
#include "mxmisc.h" #include "mxmisc.h"
#include "mxutilities.h"
#include "mxtimer.h" #include "mxtimer.h"
#include "mxvariabletable.h" #include "mxvariabletable.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);