Module: libav Branch: master Commit: 95010d18b2d808db9a49377e41bc2f7cf4dfa03e
Author: Laurent Aimar <[email protected]> Committer: Janne Grunau <[email protected]> Date: Sun Oct 2 00:48:12 2011 +0000 shorten: Prevent block size from increasing Signed-off-by: Janne Grunau <[email protected]> --- libavcodec/shorten.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 80b1b4d..8f7436e 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -482,9 +482,15 @@ static int shorten_decode_frame(AVCodecContext *avctx, case FN_BITSHIFT: s->bitshift = get_ur_golomb_shorten(&s->gb, BITSHIFTSIZE); break; - case FN_BLOCKSIZE: - s->blocksize = get_uint(s, av_log2(s->blocksize)); + case FN_BLOCKSIZE: { + int blocksize = get_uint(s, av_log2(s->blocksize)); + if (blocksize > s->blocksize) { + av_log(avctx, AV_LOG_ERROR, "Increasing block size is not supported\n"); + return AVERROR_PATCHWELCOME; + } + s->blocksize = blocksize; break; + } case FN_QUIT: *data_size = 0; return buf_size; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
