[FFmpeg-cvslog] avcodec/aacdec_template: skip apply_tns() if max_sfb is 0 (from previous header decode failure)

2019-06-04 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat 
May 18 10:37:26 2019 +0200| [cf3156e762bbd3fbaf9da53f3ef1ea6d1bad2ec5] | 
committer: Michael Niedermayer

avcodec/aacdec_template: skip apply_tns() if max_sfb is 0 (from previous header 
decode failure)

Fixes: NULL pointer dereference
Fixes: 
14723/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_LATM_fuzzer-5654612436058112
Fixes: 
14724/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_LATM_fuzzer-5712607111020544

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf3156e762bbd3fbaf9da53f3ef1ea6d1bad2ec5
---

 libavcodec/aacdec_template.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 7021153103..28765c768d 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -2492,6 +2492,9 @@ static void apply_tns(INTFLOAT coef_param[1024], 
TemporalNoiseShaping *tns,
 INTFLOAT tmp[TNS_MAX_ORDER+1];
 UINTFLOAT *coef = coef_param;
 
+if(!mmm)
+return;
+
 for (w = 0; w < ics->num_windows; w++) {
 bottom = ics->num_swb;
 for (filt = 0; filt < tns->n_filt[w]; filt++) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/aacdec_template: skip apply_tns() if max_sfb is 0 (from previous header decode failure)

2019-06-27 Thread Michael Niedermayer 
ffmpeg | branch: release/4.1 | Michael Niedermayer  | 
Sat May 18 10:37:26 2019 +0200| [5fbc6dcdccf16996ce79f17f8c0ae37069447aed] | 
committer: Michael Niedermayer

avcodec/aacdec_template: skip apply_tns() if max_sfb is 0 (from previous header 
decode failure)

Fixes: NULL pointer dereference
Fixes: 
14723/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_LATM_fuzzer-5654612436058112
Fixes: 
14724/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_LATM_fuzzer-5712607111020544

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit cf3156e762bbd3fbaf9da53f3ef1ea6d1bad2ec5)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5fbc6dcdccf16996ce79f17f8c0ae37069447aed
---

 libavcodec/aacdec_template.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index e88a26fda9..05505c0359 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -2492,6 +2492,9 @@ static void apply_tns(INTFLOAT coef_param[1024], 
TemporalNoiseShaping *tns,
 INTFLOAT tmp[TNS_MAX_ORDER+1];
 UINTFLOAT *coef = coef_param;
 
+if(!mmm)
+return;
+
 for (w = 0; w < ics->num_windows; w++) {
 bottom = ics->num_swb;
 for (filt = 0; filt < tns->n_filt[w]; filt++) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".