Skip to content

Commit bb25b05

Browse files
authored
Merge pull request #31 from hannob/master
Fix bugs when reading empty files
2 parents 0a6c8bd + f4ef239 commit bb25b05

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/load_mid.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,7 @@ BOOL CSoundFile::TestMID(const BYTE *lpStream, DWORD dwMemLength)
751751
mm.mm = (char *)lpStream;
752752
mm.sz = dwMemLength;
753753
h.mmf = &mm;
754+
if (h.mmf->sz < 4) return FALSE;
754755
mmfseek(h.mmf,0,SEEK_SET);
755756
mmreadSBYTES(id, 4, h.mmf);
756757
id[4] = '\0';

src/load_psm.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,12 @@ BOOL CSoundFile::ReadPSM(LPCBYTE lpStream, DWORD dwMemLength)
105105
BYTE samplemap[MAX_SAMPLES];
106106
UINT nPatterns;
107107

108+
if (dwMemLength < 256) return FALSE;
109+
108110
// Swap chunk
109111
swap_PSMCHUNK(pfh);
110112

111113
// Chunk0: "PSM ",filesize,"FILE"
112-
if (dwMemLength < 256) return FALSE;
113114
if (pfh->id == PSM_ID_OLD)
114115
{
115116
#ifdef PSM_LOG

0 commit comments

Comments
 (0)