Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-16 11:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

CVE-2019-7578: Fix a buffer overread in InitIMA_ADPCM

Browse Source 
If IMA ADPCM format chunk was too short, InitIMA_ADPCM() parsing it
could read past the end of chunk data. This patch fixes it.

CVE-2019-7578
https://bugzilla.libsdl.org/show_bug.cgi?id=4494

Signed-off-by: Petr P?sa? <ppisar@redhat.com>
This commit is contained in:
Sam Lantinga 2019-06-08 18:07:58 -07:00
parent 316ff3847b
commit 3f19a6d5e8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/audio/SDL_wave.c
View File

@ -229,25 +229,30 @@ static struct IMA_ADPCM_decoder
} IMA_ADPCM_state; } IMA_ADPCM_state;
static int static int
InitIMA_ADPCM(WaveFMT * format) InitIMA_ADPCM(WaveFMT * format, int length)
{ {
Uint8 *rogue_feel; Uint8 *rogue_feel, *rogue_feel_end;
/* Set the rogue pointer to the IMA_ADPCM specific data */ /* Set the rogue pointer to the IMA_ADPCM specific data */
if (length < sizeof(*format)) goto too_short;
IMA_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding); IMA_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding);
IMA_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels); IMA_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels);
IMA_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency); IMA_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency);
IMA_ADPCM_state.wavefmt.byterate = SDL_SwapLE32(format->byterate); IMA_ADPCM_state.wavefmt.byterate = SDL_SwapLE32(format->byterate);
IMA_ADPCM_state.wavefmt.blockalign = SDL_SwapLE16(format->blockalign); IMA_ADPCM_state.wavefmt.blockalign = SDL_SwapLE16(format->blockalign);
IMA_ADPCM_state.wavefmt.bitspersample = IMA_ADPCM_state.wavefmt.bitspersample = SDL_SwapLE16(format->bitspersample);
SDL_SwapLE16(format->bitspersample);
rogue_feel = (Uint8 *) format + sizeof(*format); rogue_feel = (Uint8 *) format + sizeof(*format);
rogue_feel_end = (Uint8 *) format + length;
if (sizeof(*format) == 16) { if (sizeof(*format) == 16) {
/* const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]); */ /* const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]); */
rogue_feel += sizeof(Uint16); rogue_feel += sizeof(Uint16);
} }
if (rogue_feel + 2 > rogue_feel_end) goto too_short;
IMA_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]); IMA_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]);
return (0); return (0);
too_short:
SDL_SetError("Unexpected length of a chunk with an IMA ADPCM format");
return (-1);
} }
static Sint32 static Sint32
@ -530,7 +535,7 @@ SDL_LoadWAV_RW(SDL_RWops * src, int freesrc,
break; break;
case IMA_ADPCM_CODE: case IMA_ADPCM_CODE:
/* Try to understand this */ /* Try to understand this */
if (InitIMA_ADPCM(format) < 0) { if (InitIMA_ADPCM(format, lenread) < 0) {
was_error = 1; was_error = 1;
goto done; goto done;
} }