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

Do not read beyond end of data chunk if chunk_size is set. 

Sample: http://samples.mplayerhq.hu/A-codecs/wavpcm/ahh.wav


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22121 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-02-04 09:33:57 +00:00
parent f0ae1f2dce
commit 8fdb1522a2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmpdemux/demux_audio.c
View File

@ -454,7 +454,7 @@ static int demux_audio_open(demuxer_t* demuxer) {
stream_skip(demuxer->stream, chunk_size); stream_skip(demuxer->stream, chunk_size);
} while (chunk_type != mmioFOURCC('d', 'a', 't', 'a')); } while (chunk_type != mmioFOURCC('d', 'a', 't', 'a'));
demuxer->movi_start = stream_tell(s); demuxer->movi_start = stream_tell(s);
demuxer->movi_end = s->end_pos; demuxer->movi_end = chunk_size ? demuxer->movi_start + chunk_size : s->end_pos;
// printf("wav: %X .. %X\n",(int)demuxer->movi_start,(int)demuxer->movi_end); // printf("wav: %X .. %X\n",(int)demuxer->movi_start,(int)demuxer->movi_end);
// Check if it contains dts audio // Check if it contains dts audio
if((w->wFormatTag == 0x01) && (w->nChannels == 2) && (w->nSamplesPerSec == 44100)) { if((w->wFormatTag == 0x01) && (w->nChannels == 2) && (w->nSamplesPerSec == 44100)) {
@ -598,6 +598,11 @@ static int demux_audio_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) {
case WAV : { case WAV : {
unsigned align = sh_audio->wf->nBlockAlign; unsigned align = sh_audio->wf->nBlockAlign;
l = sh_audio->wf->nAvgBytesPerSec; l = sh_audio->wf->nAvgBytesPerSec;
if (demux->movi_end && l > demux->movi_end - stream_tell(s)) {
// do not read beyond end, there might be junk after data chunk
l = demux->movi_end - stream_tell(s);
if (l <= 0) return 0;
}
if (align) if (align)
l = (l + align - 1) / align * align; l = (l + align - 1) / align * align;
dp = new_demux_packet(l); dp = new_demux_packet(l);