vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
authorAnton Khirnov <anton@khirnov.net>
Wed, 6 Mar 2013 09:42:51 +0000 (10:42 +0100)
committerReinhard Tartler <siretart@tauware.de>
Sat, 9 Mar 2013 17:54:28 +0000 (18:54 +0100)
CC:libav-stable@libav.org
(cherry picked from commit f86d66bcfa48998b0727aa0d1089a30cbeae0933)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 77cf052e395b1fac8dd181d4f76b0101d1acd625)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
libavcodec/vmdav.c

index 89b5c2b..570c362 100644 (file)
@@ -625,7 +625,7 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx, void *data,
     /* decode audio chunks */
     if (audio_chunks > 0) {
         buf_end = buf + buf_size;
-        while (buf < buf_end) {
+        while (buf + s->chunk_size <= buf_end) {
             if (s->out_bps == 2) {
                 decode_audio_s16(output_samples_s16, buf, s->chunk_size,
                                  avctx->channels);