diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 23:16:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 23:17:37 +0200 |
| commit | e756635964ed3aa1ee997465f9b46143bcb5d894 (patch) | |
| tree | 522966708021ed389c540e07e0c4884416901885 | |
| parent | b937d3694e54c6e3203a0afd3ca47be77c78f495 (diff) | |
| download | ffmpeg-e756635964ed3aa1ee997465f9b46143bcb5d894.tar.gz | |
eamad: Check against minimum supported dimensions
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/eamad.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 58cdea6753..b6bf86d307 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -257,6 +257,11 @@ static int decode_frame(AVCodecContext *avctx, calc_quant_matrix(s, buf[13]); buf += 16; + if (width < 16 || height < 16) { + av_log(avctx, AV_LOG_ERROR, "Dimensions too small\n"); + return AVERROR_INVALIDDATA; + } + if (avctx->width != width || avctx->height != height) { if((width * height)/2048*7 > buf_end-buf) return AVERROR_INVALIDDATA; |