diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-05 21:17:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-07 19:37:05 +0200 |
| commit | cc721fc29240fadd0aec5b86cf15b5ffb49f303e (patch) | |
| tree | a0815b34541114d2fa4bf95f17b9903c91c8c58c | |
| parent | 1831fa72785d46ed2ec5a0c4084866e0089574f4 (diff) | |
| download | ffmpeg-cc721fc29240fadd0aec5b86cf15b5ffb49f303e.tar.gz | |
avcodec/amr_parser: Treat 0 channels as 1
Fixes: division by 0
Fixes: 39562/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AMRWB_fuzzer-5448834960982016
Fixes: 39589/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AMRWB_fuzzer-6119205334810624
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/amr_parser.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/amr_parser.c b/libavcodec/amr_parser.c index 79258d4d0c..c0b14700e2 100644 --- a/libavcodec/amr_parser.c +++ b/libavcodec/amr_parser.c @@ -25,6 +25,7 @@ * Splits packets into individual blocks. */ +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "parser.h" @@ -62,6 +63,11 @@ static int amr_parse(AVCodecParserContext *s1, *poutbuf_size = 0; *poutbuf = NULL; + if (!avctx->channels) { + avctx->channels = 1; + avctx->channel_layout = AV_CH_LAYOUT_MONO; + } + if (s1->flags & PARSER_FLAG_COMPLETE_FRAMES) { next = buf_size; } else { |