[FFmpeg-cvslog] indeo4: Check for mismatching scan tables

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 28 14:51:21 2012 +0200| [92f7f1db421ee8b3431534fa09e8050ba622c33a] | committer: Michael Niedermayer

indeo4: Check for mismatching scan tables

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=92f7f1db421ee8b3431534fa09e8050ba622c33a
---

 libavcodec/indeo4.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index a3e2456..488f971 100644
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -393,6 +393,10 @@ static int decode_band_hdr(IVI4DecContext *ctx, IVIBandDesc *band,
             band->is_2d_trans   = transforms[transform_id].is_2d_trans;
 
             scan_indx = get_bits(&ctx->gb, 4);
+            if ((scan_indx>4 && scan_indx<10) != (band->blk_size==4)) {
+                av_log(avctx, AV_LOG_ERROR, "mismatching scan table!\n");
+                return AVERROR_INVALIDDATA;
+            }
             if (scan_indx == 15) {
                 av_log(avctx, AV_LOG_ERROR, "Custom scan pattern encountered!\n");
                 return AVERROR_INVALIDDATA;