[FFmpeg-cvslog] cook: check js_subband_start for validity

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 20 00:19:39 2013 +0100| [c69315a5deb0f8095e6b4746b69171d6f3059b2f] | committer: Michael Niedermayer

cook: check js_subband_start for validity

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/cook.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 54b576f..7dcf655 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1091,6 +1091,11 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
         if (extradata_size >= 8) {
             bytestream_get_be32(&edata_ptr);    // Unknown unused
             q->subpacket[s].js_subband_start = bytestream_get_be16(&edata_ptr);
+            if (q->subpacket[s].js_subband_start >= 51) {
+                av_log(avctx, AV_LOG_ERROR, "js_subband_start %d is too large\n", q->subpacket[s].js_subband_start);
+                return AVERROR_INVALIDDATA;
+            }
+
             q->subpacket[s].js_vlc_bits = bytestream_get_be16(&edata_ptr);
             extradata_size -= 8;
         }