diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index b5b5524919..8c6c7d5da4 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -627,7 +627,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);