From: Andreas Cadhalpun Date: Tue, 8 Nov 2016 23:38:50 +0000 (+0100) Subject: escape124: reject codebook size 0 X-Git-Tag: n3.3~2208 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=226d35c84591f1901c2a13819031549909faa1f5 escape124: reject codebook size 0 It causes a cb_depth of 32, leading to assertion failures in get_bits. Reviewed-by: Michael Niedermayer Signed-off-by: Andreas Cadhalpun --- diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index b872b3a53d..c3174ce6ef 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -249,6 +249,10 @@ static int escape124_decode_frame(AVCodecContext *avctx, // This codebook can be cut off at places other than // powers of 2, leaving some of the entries undefined. cb_size = get_bits_long(&gb, 20); + if (!cb_size) { + av_log(avctx, AV_LOG_ERROR, "Invalid codebook size 0.\n"); + return AVERROR_INVALIDDATA; + } cb_depth = av_log2(cb_size - 1) + 1; } else { cb_depth = get_bits(&gb, 4);