Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

twinvq: check output buffer size before decoding

Browse source
This commit is contained in:
Justin Ruggles 2011-09-23 19:50:41 -04:00
parent 5ed6817822
commit e53eecd0e7
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/twinvq.c
View file

@ -822,7 +822,7 @@ static int twin_decode_frame(AVCodecContext * avctx, void *data,
const ModeTab *mtab = tctx->mtab; const ModeTab *mtab = tctx->mtab;
float *out = data; float *out = data;
enum FrameType ftype; enum FrameType ftype;
int window_type; int window_type, out_size;
static const enum FrameType wtype_to_ftype_table[] = { static const enum FrameType wtype_to_ftype_table[] = {
FT_LONG, FT_LONG, FT_SHORT, FT_LONG, FT_LONG, FT_LONG, FT_SHORT, FT_LONG,
FT_MEDIUM, FT_LONG, FT_LONG, FT_MEDIUM, FT_MEDIUM FT_MEDIUM, FT_LONG, FT_LONG, FT_MEDIUM, FT_MEDIUM
@ -834,6 +834,13 @@ static int twin_decode_frame(AVCodecContext * avctx, void *data,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
out_size = mtab->size * avctx->channels *
av_get_bytes_per_sample(avctx->sample_fmt);
if (*data_size < out_size) {
av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n");
return AVERROR(EINVAL);
}
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
skip_bits(&gb, get_bits(&gb, 8)); skip_bits(&gb, get_bits(&gb, 8));
window_type = get_bits(&gb, WINDOW_TYPE_BITS); window_type = get_bits(&gb, WINDOW_TYPE_BITS);
@ -856,7 +863,7 @@ static int twin_decode_frame(AVCodecContext * avctx, void *data,
return buf_size; return buf_size;
} }
*data_size = mtab->size*avctx->channels*4; *data_size = out_size;
return buf_size; return buf_size;
} }