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

imc: check output buffer size before decoding

Browse Source
This commit is contained in:
Justin Ruggles 2011-10-28 18:24:03 -04:00
parent e9362aaedf
commit 86962b13f6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/imc.c
View File

@ -651,7 +651,7 @@ static int imc_decode_frame(AVCodecContext * avctx,
IMCContext *q = avctx->priv_data; IMCContext *q = avctx->priv_data;
int stream_format_code; int stream_format_code;
int imc_hdr, i, j; int imc_hdr, i, j, out_size;
int flag; int flag;
int bits, summer; int bits, summer;
int counter, bitscount; int counter, bitscount;
@ -662,6 +662,12 @@ static int imc_decode_frame(AVCodecContext * avctx,
return -1; return -1;
} }
out_size = COEFFS * 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);
}
q->dsp.bswap16_buf(buf16, (const uint16_t*)buf, IMC_BLOCK_SIZE / 2); q->dsp.bswap16_buf(buf16, (const uint16_t*)buf, IMC_BLOCK_SIZE / 2);
q->out_samples = data; q->out_samples = data;
@ -808,7 +814,7 @@ static int imc_decode_frame(AVCodecContext * avctx,
imc_imdct256(q); imc_imdct256(q);
*data_size = COEFFS * sizeof(float); *data_size = out_size;
return IMC_BLOCK_SIZE; return IMC_BLOCK_SIZE;
} }