RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 09:52:17 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/aacenc: Check for +-Inf too

Browse Source 
Fixes out of array read
Fixes: 04442da73d935b776d2236282588d4f9/signal_sigsegv_2625a69_8790_ae85ffc889070663319b3417ede777b0.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 22:33:59 +01:00
parent 17e7fdf61a
commit 92465a2347
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/aacenc.c
View File

@ -606,16 +606,16 @@ 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]) ||
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])
if (isnan(cpe->ch->coeffs[ 0]) || isinf(cpe->ch->coeffs[ 0]) ||
isnan(cpe->ch->coeffs[ 128]) || isinf(cpe->ch->coeffs[ 128]) ||
isnan(cpe->ch->coeffs[2*128]) || isinf(cpe->ch->coeffs[2*128]) ||
isnan(cpe->ch->coeffs[3*128]) || isinf(cpe->ch->coeffs[3*128]) ||
isnan(cpe->ch->coeffs[4*128]) || isinf(cpe->ch->coeffs[4*128]) ||
isnan(cpe->ch->coeffs[5*128]) || isinf(cpe->ch->coeffs[5*128]) ||
isnan(cpe->ch->coeffs[6*128]) || isinf(cpe->ch->coeffs[6*128]) ||
isnan(cpe->ch->coeffs[7*128]) || isinf(cpe->ch->coeffs[7*128])
) {
av_log(avctx, AV_LOG_ERROR, "Input contains NaN\n");
av_log(avctx, AV_LOG_ERROR, "Input contains NaN/+-Inf\n");
return AVERROR(EINVAL);
}
avoid_clipping(s, sce);