Check whether extra bits block has enough data.
authorLaurent Aimar <fenrir@via.ecp.fr>
Sun, 3 May 2009 05:42:51 +0000 (05:42 +0000)
committerKostya Shishkov <kostya.shishkov@gmail.com>
Sun, 3 May 2009 05:42:51 +0000 (05:42 +0000)
Patch by Laurent Aimar "f\145nr\151r >at< vide\157lan <dot> o\162g"

Originally committed as revision 18732 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/wavpack.c

index c8ab858..544ed96 100644 (file)
@@ -795,6 +795,14 @@ static int wavpack_decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "Packed samples not found\n");
         return -1;
     }
+    if(s->got_extra_bits){
+        const int size = s->gb_extra_bits.size_in_bits - get_bits_count(&s->gb_extra_bits);
+        const int wanted = s->samples * s->extra_bits << s->stereo_in;
+        if(size < wanted){
+            av_log(avctx, AV_LOG_ERROR, "Too small EXTRABITS\n");
+            s->got_extra_bits = 0;
+        }
+    }
 
     if(s->stereo_in){
         if(bpp == 2)