YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

Revert "engine: soundlib: wav: attempt to make FindNextChunk more safe"

Browse Source 
This reverts commit 78e239d883505e1ad64232812bce6ea8b726632f.
This commit is contained in:
Alibek Omarov 2023-05-05 21:19:58 +03:00
parent 78e239d883
commit 4856a3c084
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engine/common/soundlib/snd_wav.c
View File

@ -62,14 +62,11 @@ FindNextChunk
*/ */
static void FindNextChunk( const char *name ) static void FindNextChunk( const char *name )
{ {
int remaining;
while( 1 ) while( 1 )
{ {
iff_dataPtr = iff_lastChunk; iff_dataPtr = iff_lastChunk;
remaining = iff_end - iff_dataPtr;
if( remaining < 8 ) if( iff_dataPtr >= iff_end )
{ {
// didn't find the chunk // didn't find the chunk
iff_dataPtr = NULL; iff_dataPtr = NULL;
@ -79,24 +76,14 @@ static void FindNextChunk( const char *name )
iff_dataPtr += 4; iff_dataPtr += 4;
iff_chunkLen = GetLittleLong(); iff_chunkLen = GetLittleLong();
remaining -= 8;
if( iff_chunkLen < 0 ) if( iff_chunkLen < 0 )
{ {
iff_dataPtr = NULL; iff_dataPtr = NULL;
return; return;
} }
if( iff_chunkLen > remaining )
{
iff_chunkLen = remaining;
}
remaining -= iff_chunkLen;
iff_dataPtr -= 8; iff_dataPtr -= 8;
iff_lastChunk = iff_dataPtr + 8 + iff_chunkLen; iff_lastChunk = iff_dataPtr + 8 + ((iff_chunkLen + 1) & ~1);
if( iff_chunkLen & 1 && remaining )
iff_chunkLen++;
if( !Q_strncmp( (const char *)iff_dataPtr, name, 4 )) if( !Q_strncmp( (const char *)iff_dataPtr, name, 4 ))
return; return;