From b08001e00ac4be3dd586825d135b30bdf389d7b0 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 16 Sep 2011 18:01:28 -0400 Subject: [PATCH] shorten: check output buffer size before decoding Signed-off-by: Michael Niedermayer --- libavcodec/shorten.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 8ebe033454..0b9d420d86 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -481,6 +481,12 @@ static int shorten_decode_frame(AVCodecContext *avctx, s->cur_chan++; 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); s->cur_chan = 0; goto frame_done;