ffmpeg | branch: release/2.6 | Michael Niedermayer <mich...@niedermayer.cc> |
Sat Jan 16 18:32:07 2016 +0100| [9acbe5fa8489f26223aef0247b7486b0197118f8] |
committer: Michael Niedermayer
avcodec/aacenc: Check both channels for finiteness
Fixes null pointer dereference
Fixes:
10412fc52ecc6eab40ed67f82ca7b372/signal_sigsegv_2618c99_2129_f808373959e46afb165593332799ffbc.aif
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 057549a9ccc9fd32df71678e6abe69e10668186a)
Conflicts:
libavcodec/aacenc.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9acbe5fa8489f26223aef0247b7486b0197118f8
---
libavcodec/aacenc.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 7015a27..f852b7d 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -578,8 +578,16 @@ static int aac_encode_frame(AVCodecContext *avctx,
AVPacket *avpkt,
ics->group_len[w] = wi[ch].grouping[w];
apply_window_and_mdct(s, &cpe->ch[ch], overlap);
- if (isnan(cpe->ch->coeffs[0])) {
- av_log(avctx, AV_LOG_ERROR, "Input contains NaN\n");
+
+ if (isnan(cpe->ch[ch].coeffs[ 0]) || isinf(cpe->ch[ch].coeffs[
0]) ||
+ isnan(cpe->ch[ch].coeffs[ 128]) || isinf(cpe->ch[ch].coeffs[
128]) ||
+ isnan(cpe->ch[ch].coeffs[2*128]) ||
isinf(cpe->ch[ch].coeffs[2*128]) ||
+ isnan(cpe->ch[ch].coeffs[3*128]) ||
isinf(cpe->ch[ch].coeffs[3*128]) ||
+ isnan(cpe->ch[ch].coeffs[4*128]) ||
isinf(cpe->ch[ch].coeffs[4*128]) ||
+ isnan(cpe->ch[ch].coeffs[5*128]) ||
isinf(cpe->ch[ch].coeffs[5*128]) ||
+ isnan(cpe->ch[ch].coeffs[6*128]) ||
isinf(cpe->ch[ch].coeffs[6*128]) ||
+ isnan(cpe->ch[ch].coeffs[7*128]) ||
isinf(cpe->ch[ch].coeffs[7*128])) {
+ av_log(avctx, AV_LOG_ERROR, "Input contains NaN/+-Inf\n");
return AVERROR(EINVAL);
}
}
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
