Skip to content

Avoid unaligned memory access in the PSM loader #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid unaligned memory access in the PSM loader #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/load_psm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ typedef struct _PSMSAMPLE

#pragma pack()

DWORD read_DWORD(LPCBYTE lpStream){
DWORD s;
memcpy(&s,lpStream,sizeof(s));
return bswapLE32(s);
}

void swap_PSMSAMPLE(PSMSAMPLE* p){
p->smpid = bswapLE32(p->smpid);
p->length = bswapLE32(p->length);
Expand Down Expand Up @@ -215,7 +221,7 @@ BOOL CSoundFile::ReadPSM(LPCBYTE lpStream, DWORD dwMemLength)
m_nChannels = pSong->channels;
// Valid song header -> convert attached chunks
{
DWORD dwSongEnd = dwSongPos + 8 + *(DWORD *)(lpStream+dwSongPos+4);
DWORD dwSongEnd = dwSongPos + 8 + read_DWORD(lpStream+dwSongPos+4);
dwMemPos = dwSongPos + 8 + 11; // sizeof(PSMCHUNK)+sizeof(PSMSONGHDR)
while (dwMemPos + 8 < dwSongEnd)
{
Expand All @@ -235,10 +241,10 @@ BOOL CSoundFile::ReadPSM(LPCBYTE lpStream, DWORD dwMemLength)
{
BOOL bFound = FALSE;
pos -= 5;
DWORD dwName = *(DWORD *)(pdata+pos);
DWORD dwName = read_DWORD(pdata+pos);
for (UINT i=0; i<nPatterns; i++)
{
DWORD dwPatName = ((const PSMPATTERN *)(lpStream+patptrs[i]+8))->name;
DWORD dwPatName = read_DWORD(lpStream+patptrs[i]+12);
if (dwName == dwPatName)
{
bFound = TRUE;
Expand All @@ -256,10 +262,10 @@ BOOL CSoundFile::ReadPSM(LPCBYTE lpStream, DWORD dwMemLength)
UINT iOrd = 0;
while ((pos+5<len) && (iOrd < MAX_ORDERS))
{
DWORD dwName = *(DWORD *)(pdata+pos);
DWORD dwName = read_DWORD(pdata+pos);
for (UINT i=0; i<nPatterns; i++)
{
DWORD dwPatName = ((const PSMPATTERN *)(lpStream+patptrs[i]+8))->name;
DWORD dwPatName = read_DWORD(lpStream+patptrs[i]+12);
if (dwName == dwPatName)
{
Order[iOrd++] = i;
Expand Down