diff options
| author | Laurent Aimar <fenrir@elivagar.org> | 2011-10-01 00:43:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-02 05:48:13 +0200 |
| commit | 55a96a984ec65736475a8577a158abc5c48fd50a (patch) | |
| tree | e2b1cd437d668d3c84163cff2c66abccafc028b0 /libavcodec | |
| parent | 64a9004d0771473b10655a3779b63e4e64505aa7 (diff) | |
| download | ffmpeg-55a96a984ec65736475a8577a158abc5c48fd50a.tar.gz | |
Prevent block size from inreasing in the shorten decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b399cbfba5d901608c18e1a2d48a24c30541a634)
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/shorten.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 5e599fd504..4c1abe8e4c 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -483,9 +483,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; |