aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/qcelpdec.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-09-14 13:38:07 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2011-10-04 17:10:11 -0400
commite43dd3d2a8e106169e707484090a2d973ece2184 (patch)
treec4189d4542bc6b2395e6e3dd3a8b6236571ed5fd /libavcodec/qcelpdec.c
parentbde25700134b98068e2ad21c1f92955a4b489cdc (diff)
downloadffmpeg-e43dd3d2a8e106169e707484090a2d973ece2184.tar.gz
qcelp: check output buffer size before decoding
Diffstat (limited to 'libavcodec/qcelpdec.c')
-rw-r--r--libavcodec/qcelpdec.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c
index 477eaee8c6..a8a65fce06 100644
--- a/libavcodec/qcelpdec.c
+++ b/libavcodec/qcelpdec.c
@@ -738,11 +738,17 @@ static int qcelp_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
int buf_size = avpkt->size;
QCELPContext *q = avctx->priv_data;
float *outbuffer = data;
- int i;
+ int i, out_size;
float quantized_lspf[10], lpc[10];
float gain[16];
float *formant_mem;
+ out_size = 160 * 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);
+ }
+
if((q->bitrate = determine_bitrate(avctx, buf_size, &buf)) == I_F_Q)
{
warn_insufficient_frame_quality(avctx, "bitrate cannot be determined.");
@@ -837,7 +843,7 @@ erasure:
memcpy(q->prev_lspf, quantized_lspf, sizeof(q->prev_lspf));
q->prev_bitrate = q->bitrate;
- *data_size = 160 * sizeof(*outbuffer);
+ *data_size = out_size;
return buf_size;
}