diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-13 14:15:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-13 17:09:15 +0100 |
| commit | 0634c5425306547e593bedbbbd2d982d7f0a27cf (patch) | |
| tree | 6c7e24e7beed459045f0d6f0bb5f6bc32aeef2a9 /libavcodec/aacenc.c | |
| parent | bfc8a4dabe5a0154b31128b59dca575010176441 (diff) | |
| download | ffmpeg-0634c5425306547e593bedbbbd2d982d7f0a27cf.tar.gz | |
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>
Diffstat (limited to 'libavcodec/aacenc.c')
| -rw-r--r-- | libavcodec/aacenc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 4b94f98823..127ad4a810 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -606,7 +606,15 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, 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"); return AVERROR(EINVAL); } |