From 6c0027bb3971dc9a06b5847c51a106e10c7b6fcb Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 21 Apr 2012 21:39:18 +0200 Subject: dnxhddec: check that the indicated bit depth matches the tables. Fixes crash Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/dnxhddec.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavcodec/dnxhddec.c') diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index aeb4b3d6ab..4b2338001c 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -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); -- cgit v1.2.3