RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

attempt to fix missing and/or broken boundary checks 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16966 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-11-10 20:41:11 +00:00
parent 57334e4ab7
commit fdb4583189
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmpcodecs/ad_dk3adpcm.c
View File

@ -145,7 +145,7 @@ static int dk3_adpcm_decode_block(unsigned short *output, unsigned char *input,
sum_index = input[14];
diff_index = input[15];
while (in_ptr < block_size)
while (in_ptr < block_size - !decode_top_nibble_next)
// while (in_ptr < 2048)
{
// process the first predictor of the sum channel
@ -237,7 +237,11 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
sh_audio->ds->ss_mul)
return -1; /* EOF */
if (maxlen < 2 * 4 * sh_audio->wf->nBlockAlign * 2 / 3) {
mp_msg(MSGT_DECAUDIO, MSGL_V, "dk3adpcm: maxlen too small in decode_audio\n");
return -1;
}
return 2 * dk3_adpcm_decode_block(
(unsigned short*)buf, sh_audio->a_in_buffer,
sh_audio->wf->nBlockAlign);
sh_audio->ds->ss_mul);
}