ffmpeg | branch: release/2.8 | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Wed Nov 9 00:38:50 2016 +0100| [dc821d42a2fd79ac64161f50decf5922e431445a] | committer: Andreas Cadhalpun
escape124: reject codebook size 0 It causes a cb_depth of 32, leading to assertion failures in get_bits. Reviewed-by: Michael Niedermayer <mich...@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> (cherry picked from commit 226d35c84591f1901c2a13819031549909faa1f5) Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc821d42a2fd79ac64161f50decf5922e431445a --- libavcodec/escape124.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index efcac64..d8a89a9 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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
