[FFmpeg-cvslog] wavpack: return an error on 0-sized blocks

Anton Khirnov git at videolan.org
Tue May 28 11:34:48 CEST 2013


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun May 26 10:44:11 2013 +0200| [d1bec4be2207738669874e02605e879ea9620974] | committer: Anton Khirnov

wavpack: return an error on 0-sized blocks

Such blocks are not valid.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1bec4be2207738669874e02605e879ea9620974
---

 libavcodec/wavpack.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 2afc1ed..d673ad4 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -765,11 +765,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
     int i, j, id, size, ssize, weights, t;
     int bpp, chan, chmask, orig_bpp;
 
-    if (buf_size == 0) {
-        *got_frame_ptr = 0;
-        return 0;
-    }
-
     if (block_no >= wc->fdec_num && wv_alloc_frame_context(wc) < 0) {
         av_log(avctx, AV_LOG_ERROR, "Error creating frame decode context\n");
         return AVERROR_INVALIDDATA;
@@ -1212,7 +1207,7 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
                 frame_size = AV_RL32(buf + 8) + 12;
             }
         }
-        if (frame_size < 0 || frame_size > buf_size) {
+        if (frame_size <= 0 || frame_size > buf_size) {
             av_log(avctx, AV_LOG_ERROR,
                    "Block %d has invalid size (size %d vs. %d bytes left)\n",
                    s->block, frame_size, buf_size);



More information about the ffmpeg-cvslog mailing list