diff options
author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-11-09 02:38:50 +0300 |
---|---|---|
committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-11-09 23:10:59 +0300 |
commit | 226d35c84591f1901c2a13819031549909faa1f5 (patch) | |
tree | f1bca7b854c2c79bcd23c8ac5385deaacac15c1a /libavcodec/escape124.c | |
parent | d54c95a1435a8a3fcd599108ec85b7f56a0fcbf9 (diff) |
escape124: reject codebook size 0
It causes a cb_depth of 32, leading to assertion failures in get_bits.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavcodec/escape124.c')
-rw-r--r-- | libavcodec/escape124.c | 4 |
1 files changed, 4 insertions, 0 deletions
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); |