Make sure we only parse max amount of subpackets (5) in the cook decoder.

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

diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 8a909df..99d1bdb 100644 (file)
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1219,6 +1219,10 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
 
         q->num_subpackets++;
         s++;
+        if (s > MAX_SUBPACKETS) {
+            av_log(avctx,AV_LOG_ERROR,"Too many subpackets > 5, report file!\n");
+            return -1;
+        }
     }
     /* Generate tables */
     init_pow2table();