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

avcodec/shorten: check bitshift

Browse Source 
Fixes invalid shift
Fixes CID1194400

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-27 06:03:32 +02:00
parent b2cfd1fde7
commit e20ebe491c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/shorten.c
View File

@ -505,9 +505,16 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data,
while (len--) while (len--)
get_ur_golomb_shorten(&s->gb, VERBATIM_BYTE_SIZE); get_ur_golomb_shorten(&s->gb, VERBATIM_BYTE_SIZE);
break; break;
case FN_BITSHIFT: case FN_BITSHIFT: {
s->bitshift = get_ur_golomb_shorten(&s->gb, BITSHIFTSIZE); unsigned bitshift = get_ur_golomb_shorten(&s->gb, BITSHIFTSIZE);
if (bitshift > 31) {
av_log(avctx, AV_LOG_ERROR, "bitshift %d is invalid\n",
bitshift);
return AVERROR_PATCHWELCOME;
}
s->bitshift = bitshift;
break; break;
}
case FN_BLOCKSIZE: { case FN_BLOCKSIZE: {
unsigned blocksize = get_uint(s, av_log2(s->blocksize)); unsigned blocksize = get_uint(s, av_log2(s->blocksize));
if (blocksize > s->blocksize) { if (blocksize > s->blocksize) {