flacdec: Warn about invalid max blocksize and limit the minimum value.
authorJustin Ruggles <justin.ruggles@gmail.com>
Tue, 3 Mar 2009 05:53:38 +0000 (05:53 +0000)
committerJustin Ruggles <justin.ruggles@gmail.com>
Tue, 3 Mar 2009 05:53:38 +0000 (05:53 +0000)
Originally committed as revision 17751 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/flacdec.c

index 80c0318..895214c 100644 (file)
@@ -187,6 +187,11 @@ void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
 
     skip_bits(&gb, 16); /* skip min blocksize */
     s->max_blocksize = get_bits(&gb, 16);
+    if (s->max_blocksize < 16) {
+        av_log(avctx, AV_LOG_WARNING, "invalid max blocksize: %d\n",
+               s->max_blocksize);
+        s->max_blocksize = 16;
+    }
 
     skip_bits(&gb, 24); /* skip min frame size */
     s->max_framesize = get_bits_long(&gb, 24);