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

eamad: Check against minimum supported dimensions

Browse Source 
Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e756635964)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-03 23:16:54 +02:00
parent c93501687c
commit 6e3697b985
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/eamad.c
View File

@@ -255,6 +255,11 @@ static int decode_frame(AVCodecContext *avctx,
calc_quant_matrix(s, buf[13]); calc_quant_matrix(s, buf[13]);
buf += 16; 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 (avctx->width != width || avctx->height != height) {
if((width * height)/2048*7 > buf_end-buf) if((width * height)/2048*7 > buf_end-buf)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;