RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/aacenc: Fix NAN check 

All MDCT outputs must be checked in case of 128point MDCTs
Fixes: out of array read
Fixes: 04442da73d935b776d2236282588d4f9/signal_sigsegv_2625a69_351_52ca6226eb83547a2d26e322ce84ed84.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-01-13 14:15:11 +01:00
parent bfc8a4dabe
commit 0634c54253
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/aacenc.c
View File

@ -606,7 +606,15 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
s->mdct1024.mdct_calc(&s->mdct1024, sce->lcoeffs, sce->ret_buf); s->mdct1024.mdct_calc(&s->mdct1024, sce->lcoeffs, sce->ret_buf);
} }
if (isnan(cpe->ch->coeffs[0])) { if (isnan(cpe->ch->coeffs[0]) ||
isnan(cpe->ch->coeffs[ 128]) ||
isnan(cpe->ch->coeffs[2*128]) ||
isnan(cpe->ch->coeffs[3*128]) ||
isnan(cpe->ch->coeffs[4*128]) ||
isnan(cpe->ch->coeffs[5*128]) ||
isnan(cpe->ch->coeffs[6*128]) ||
isnan(cpe->ch->coeffs[7*128])
) {
av_log(avctx, AV_LOG_ERROR, "Input contains NaN\n"); av_log(avctx, AV_LOG_ERROR, "Input contains NaN\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }