fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

snd_mem.c (FindNextChunk): fixed segfaults due to bad wav files like some 

of those in the arwop mod.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@5 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2010-02-15 23:37:38 +00:00
parent 6b49181bfb
commit 141b4836ac
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Quake/snd_mem.c
View File

@ -194,26 +194,26 @@ void FindNextChunk(char *name)
{ {
while (1) while (1)
{ {
data_p=last_chunk; // Need at least 8 bytes for a chunk
if (last_chunk + 8 >= iff_end)
if (data_p >= iff_end)
{ // didn't find the chunk
data_p = NULL;
return;
}
data_p += 4;
iff_chunk_len = GetLittleLong();
if (iff_chunk_len < 0)
{ {
data_p = NULL; data_p = NULL;
return; return;
} }
data_p = last_chunk + 4;
iff_chunk_len = GetLittleLong();
if (iff_chunk_len < 0 || iff_chunk_len > iff_end - data_p)
{
data_p = NULL;
Con_DPrintf("Bad \"%s\" chunk length (%d) in wav file\n", name, iff_chunk_len);
return;
}
// if (iff_chunk_len > 1024*1024) // if (iff_chunk_len > 1024*1024)
// Sys_Error ("FindNextChunk: %i length is past the 1 meg sanity limit", iff_chunk_len); // Sys_Error ("FindNextChunk: %i length is past the 1 meg sanity limit", iff_chunk_len);
last_chunk = data_p + ((iff_chunk_len + 1) & ~1);
data_p -= 8; data_p -= 8;
last_chunk = data_p + 8 + ( (iff_chunk_len + 1) & ~1 ); if (!Q_strncmp((char *)data_p, name, 4))
if (!Q_strncmp(data_p, name, 4))
return; return;
} }
} }