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-17 23:15:42 +0100
commit72a2d6ff56ce2e06a756d1f86cae300944838096 (patch)
treebcfb98cee69df247a4c7924e31d1cd0e9b2e859d
parent9dee25fbc79661b8d11039eacb6b4cf8fe2fc1f9 (diff)
downloadffmpeg-72a2d6ff56ce2e06a756d1f86cae300944838096.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 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);