From 76160e7e5c1510b995a067a40c1845afcbf3bf43 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 4 Mar 2007 14:11:44 +0000 Subject: Do not read more audio samples than available git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22445 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_avs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libmpdemux/demux_avs.c') diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c index aadbb6ef84..2a39b25cbd 100644 --- a/libmpdemux/demux_avs.c +++ b/libmpdemux/demux_avs.c @@ -208,7 +208,10 @@ static int demux_avs_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) { sh_audio_t *sh_audio = ds->sh; int samples = sh_audio->samplerate; - uint64_t l = samples * sh_audio->channels * sh_audio->samplesize; + uint64_t l; + samples = FFMIN(samples, AVS->video_info->num_audio_samples - AVS->sampleno); + if (!samples) return 0; + l = samples * sh_audio->channels * sh_audio->samplesize; if (l > INT_MAX) { mp_msg(MSGT_DEMUX, MSGL_FATAL, "AVS: audio packet too big\n"); return 0; -- cgit v1.2.3