generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shorten: validate block size

Browse Source
This commit is contained in:
Justin Ruggles 2011-09-16 15:31:31 -04:00
parent 45d7d31fb9
commit cfa317f67d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/shorten.c
View File

@ -330,8 +330,16 @@ static int read_header(ShortenContext *s)
/* get blocksize if version > 0 */ /* get blocksize if version > 0 */
if (s->version > 0) { if (s->version > 0) {
int skip_bytes; int skip_bytes, blocksize;
s->blocksize = get_uint(s, av_log2(DEFAULT_BLOCK_SIZE));
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); maxnlpc = get_uint(s, LPCQSIZE);
s->nmean = get_uint(s, 0); 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"); av_log(avctx, AV_LOG_ERROR, "Increasing block size is not supported\n");
return AVERROR_PATCHWELCOME; 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; s->blocksize = blocksize;
break; break;
} }