# HG changeset patch
# User reimar
# Date 1173017504 0
# Node ID 08045a99dddbf2690873495bfcec83d820ab15c0
# Parent  807484e8d248e4c805df6c9eb2d3dec74d5fb8a9
Do not read more audio samples than available

diff -r 807484e8d248 -r 08045a99dddb libmpdemux/demux_avs.c
--- a/libmpdemux/demux_avs.c	Sun Mar 04 13:56:45 2007 +0000
+++ b/libmpdemux/demux_avs.c	Sun Mar 04 14:11:44 2007 +0000
@@ -208,7 +208,10 @@
     {
         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;