summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-18 22:24:04 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-11-09 16:06:32 +0100
commit20fad712474f582e74df025365a4b4860b779592 (patch)
tree0b9a21d3cadf6227f346580a4c0605f13575eded /libavcodec
parent17603094d57faf95bee00d557fe6de84a05352ef (diff)
downloadffmpeg-streaming-20fad712474f582e74df025365a4b4860b779592.zip
ffmpeg-streaming-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>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/decode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index a7b37c6..0883c72 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);
}
OpenPOWER on IntegriCloud