From 8dfb13ea59f87365f407dfe4fc196b50e3fad92b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 16 Apr 2012 01:57:36 +0200 Subject: adxdec: Check available space before decoding block. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/adxdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/adxdec.c') diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index ec4b1041af..630b79599b 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -100,6 +100,7 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data, ADXContext *c = avctx->priv_data; int16_t *samples; const uint8_t *buf = avpkt->data; + const uint8_t *buf_end = buf + avpkt->size; int num_blocks, ch, ret; if (c->eof) { @@ -148,7 +149,7 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data, while (num_blocks--) { for (ch = 0; ch < c->channels; ch++) { - if (adx_decode(c, samples + ch, buf, ch)) { + if (buf_end - buf < BLOCK_SIZE || adx_decode(c, samples + ch, buf, ch)) { c->eof = 1; buf = avpkt->data + avpkt->size; break; -- cgit v1.2.3