[FFmpeg-cvslog] r17747 - trunk/libavcodec/flacdec.c

[jbr]

Author: jbr
Date: Tue Mar  3 06:22:44 2009
New Revision: 17747

Log:
flacdec: Return error when blocksize code of 0 is found. It is a 
reserved value per the FLAC format documentation.

Modified:
   trunk/libavcodec/flacdec.c

Modified: trunk/libavcodec/flacdec.c
==============================================================================
--- trunk/libavcodec/flacdec.c	Tue Mar  3 06:18:39 2009	(r17746)
+++ trunk/libavcodec/flacdec.c	Tue Mar  3 06:22:44 2009	(r17747)
@@ -527,9 +527,10 @@ static int decode_frame(FLACContext *s, 
         return -1;
     }
 
-    if (blocksize_code == 0)
-        blocksize = s->min_blocksize;
-    else if (blocksize_code == 6)
+    if (blocksize_code == 0) {
+        av_log(s->avctx, AV_LOG_ERROR, "reserved blocksize code: 0\n");
+        return -1;
+    } else if (blocksize_code == 6)
         blocksize = get_bits(&s->gb, 8)+1;
     else if (blocksize_code == 7)
         blocksize = get_bits(&s->gb, 16)+1;