aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-09 00:38:50 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-27 00:38:56 +0100
commite14cc2f1975b608b630725007bda10f49aa096a1 (patch)
tree2f18f4336f02b0b4911c0391da2b55954b727280
parent05e6606ba98a53f10213b2f8b07afc3e62731c5a (diff)
downloadffmpeg-e14cc2f1975b608b630725007bda10f49aa096a1.tar.gz
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> (cherry picked from commit 226d35c84591f1901c2a13819031549909faa1f5) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-rw-r--r--libavcodec/escape124.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c
index 50a86c8355..dfbaec9877 100644
--- a/libavcodec/escape124.c
+++ b/libavcodec/escape124.c
@@ -250,6 +250,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);