diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-18 22:24:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-09 16:06:32 +0100 |
| commit | 20fad712474f582e74df025365a4b4860b779592 (patch) | |
| tree | 0b9a21d3cadf6227f346580a4c0605f13575eded | |
| parent | 17603094d57faf95bee00d557fe6de84a05352ef (diff) | |
| download | ffmpeg-20fad712474f582e74df025365a4b4860b779592.tar.gz | |
avcodec/decode: Also consider channels in max_samples check
Fixes: Timeout (109sec -> 0.6sec)
Fixes: 18309/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INTERPLAY_ACM_fuzzer-6226598168100864
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/decode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index a7b37c6917..0883c7209c 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1925,7 +1925,7 @@ static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags) return AVERROR(EINVAL); } } else if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) { - if (frame->nb_samples > avctx->max_samples) { + if (frame->nb_samples * avctx->channels > avctx->max_samples) { av_log(avctx, AV_LOG_ERROR, "samples per frame %d, exceeds max_samples %"PRId64"\n", frame->nb_samples, avctx->max_samples); return AVERROR(EINVAL); } |