[FFmpeg-cvslog] avcodec/cook: Check samples_per_channel earlier
Michael Niedermayer
git at videolan.org
Sat Nov 9 21:28:55 EET 2019
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Oct 23 19:41:27 2019 +0200| [57750bb629a145326e20b8760f21f1041464a937] | committer: Michael Niedermayer
avcodec/cook: Check samples_per_channel earlier
Fixes: division by zero
Fixes: 18362/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_COOK_fuzzer-5653727679086592
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=57750bb629a145326e20b8760f21f1041464a937
---
libavcodec/cook.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index aa11205166..3a40ccaf2c 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1217,6 +1217,15 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
return AVERROR_PATCHWELCOME;
}
}
+
+ /* Try to catch some obviously faulty streams, otherwise it might be exploitable */
+ if (q->samples_per_channel != 256 && q->samples_per_channel != 512 &&
+ q->samples_per_channel != 1024) {
+ avpriv_request_sample(avctx, "samples_per_channel = %d",
+ q->samples_per_channel);
+ return AVERROR_PATCHWELCOME;
+ }
+
/* Generate tables */
init_pow2table();
init_gain_table(q);
@@ -1252,14 +1261,6 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
q->saturate_output = saturate_output_float;
}
- /* Try to catch some obviously faulty streams, otherwise it might be exploitable */
- if (q->samples_per_channel != 256 && q->samples_per_channel != 512 &&
- q->samples_per_channel != 1024) {
- avpriv_request_sample(avctx, "samples_per_channel = %d",
- q->samples_per_channel);
- return AVERROR_PATCHWELCOME;
- }
-
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
if (channel_mask)
avctx->channel_layout = channel_mask;
More information about the ffmpeg-cvslog
mailing list