virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

atrac3: check output buffer size before decoding

Browse Source
This commit is contained in:
Justin Ruggles 2011-10-14 17:09:58 -04:00
parent 6ba7f78bbb
commit 7e4881a2d0
1 changed files with 8 additions and 2 deletions

10
libavcodec/atrac3.c

@ -827,7 +827,7 @@ static int atrac3_decode_frame(AVCodecContext *avctx,
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
ATRAC3Context *q = avctx->priv_data; ATRAC3Context *q = avctx->priv_data;
int result = 0; int result = 0, out_size;
const uint8_t* databuf; const uint8_t* databuf;
float *samples = data; float *samples = data;
@ -838,6 +838,12 @@ static int atrac3_decode_frame(AVCodecContext *avctx,
return buf_size; return buf_size;
} }
out_size = 1024 * q->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);
}
/* Check if we need to descramble and what buffer to pass on. */ /* Check if we need to descramble and what buffer to pass on. */
if (q->scrambled_stream) { if (q->scrambled_stream) {
decode_bytes(buf, q->decoded_bytes_buffer, avctx->block_align); decode_bytes(buf, q->decoded_bytes_buffer, avctx->block_align);
@ -858,7 +864,7 @@ static int atrac3_decode_frame(AVCodecContext *avctx,
q->fmt_conv.float_interleave(samples, (const float **)q->outSamples, q->fmt_conv.float_interleave(samples, (const float **)q->outSamples,
1024, 2); 1024, 2);
} }
*data_size = 1024 * q->channels * av_get_bytes_per_sample(avctx->sample_fmt); *data_size = out_size;
return avctx->block_align; return avctx->block_align;
} }