highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

escape124: reject codebook size 0

Browse Source 
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 226d35c845)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun
2016-11-09 00:38:50 +01:00
parent 9dee25fbc7
commit 72a2d6ff56
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/escape124.c
View File

@@ -249,6 +249,10 @@ static int escape124_decode_frame(AVCodecContext *avctx,
// This codebook can be cut off at places other than // This codebook can be cut off at places other than
// powers of 2, leaving some of the entries undefined. // powers of 2, leaving some of the entries undefined.
cb_size = get_bits_long(&gb, 20); 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; cb_depth = av_log2(cb_size - 1) + 1;
} else { } else {
cb_depth = get_bits(&gb, 4); cb_depth = get_bits(&gb, 4);