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

shorten: check output buffer size before decoding

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Justin Ruggles
2011-09-16 18:01:28 -04:00
committed by Michael Niedermayer
parent e1ea35fb52
commit b08001e00a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/shorten.c
View File

@@ -481,6 +481,12 @@ static int shorten_decode_frame(AVCodecContext *avctx,
s->cur_chan++; s->cur_chan++;
if (s->cur_chan == s->channels) { if (s->cur_chan == s->channels) {
int out_size = s->blocksize * s->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);
}
samples = interleave_buffer(samples, s->channels, s->blocksize, s->decoded); samples = interleave_buffer(samples, s->channels, s->blocksize, s->decoded);
s->cur_chan = 0; s->cur_chan = 0;
goto frame_done; goto frame_done;