dnxhddec: check that the indicated bit depth matches the tables.
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Apr 2012 19:39:18 +0000 (21:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Apr 2012 19:39:18 +0000 (21:39 +0200)
Fixes crash

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

index aeb4b3d..4b23380 100644 (file)
@@ -82,6 +82,10 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, int cid)
             av_log(ctx->avctx, AV_LOG_ERROR, "unsupported cid %d\n", cid);
             return -1;
         }
+        if (ff_dnxhd_cid_table[index].bit_depth != ctx->bit_depth) {
+            av_log(ctx->avctx, AV_LOG_ERROR, "bit depth mismatches %d %d\n", ff_dnxhd_cid_table[index].bit_depth, ctx->bit_depth);
+            return AVERROR_INVALIDDATA;
+        }
         ctx->cid_table = &ff_dnxhd_cid_table[index];
 
         ff_free_vlc(&ctx->ac_vlc);