diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-16 15:31:31 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-20 13:09:25 -0400 |
| commit | cfa317f67d023443c8f097524b367ec9c48f5c81 (patch) | |
| tree | 64dc27a0af4942be9c6e18de8c57ffb53ddf08ed /libavcodec/shorten.c | |
| parent | 45d7d31fb94ded19de2bfdb064804e617c068879 (diff) | |
| download | ffmpeg-cfa317f67d023443c8f097524b367ec9c48f5c81.tar.gz | |
shorten: validate block size
Diffstat (limited to 'libavcodec/shorten.c')
| -rw-r--r-- | libavcodec/shorten.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 2502587604..3f06e57084 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -330,8 +330,16 @@ static int read_header(ShortenContext *s) /* get blocksize if version > 0 */ if (s->version > 0) { - int skip_bytes; - s->blocksize = get_uint(s, av_log2(DEFAULT_BLOCK_SIZE)); + int skip_bytes, blocksize; + + blocksize = get_uint(s, av_log2(DEFAULT_BLOCK_SIZE)); + if (!blocksize || blocksize > MAX_BLOCKSIZE) { + av_log(s->avctx, AV_LOG_ERROR, "invalid or unsupported block size: %d\n", + blocksize); + return AVERROR(EINVAL); + } + s->blocksize = blocksize; + maxnlpc = get_uint(s, LPCQSIZE); s->nmean = get_uint(s, 0); @@ -456,6 +464,11 @@ static int shorten_decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "Increasing block size is not supported\n"); return AVERROR_PATCHWELCOME; } + if (!blocksize || blocksize > MAX_BLOCKSIZE) { + av_log(avctx, AV_LOG_ERROR, "invalid or unsupported " + "block size: %d\n", blocksize); + return AVERROR(EINVAL); + } s->blocksize = blocksize; break; } |