diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-09-25 01:07:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-01-06 11:30:43 +0100 |
| commit | 86acbb0350d2d6a66fbae8fecdb66797666f9bf4 (patch) | |
| tree | bc701a64742fa6a4d2c2e8aedf2fb35d0c4ae221 /libavcodec/g729_parser.c | |
| parent | a3f6f2150649f7187e63136423c345b8ec532521 (diff) | |
| download | ffmpeg-86acbb0350d2d6a66fbae8fecdb66797666f9bf4.tar.gz | |
avcodec/g729_parser: Check block_size
Fixes: Infinite loop
Fixes: 17611/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ACELP_KELVIN_fuzzer-5765134928052224
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 972a0a818ff7a9b33c7f37e08783f4b6082f9aa2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/g729_parser.c')
| -rw-r--r-- | libavcodec/g729_parser.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/g729_parser.c b/libavcodec/g729_parser.c index d13c990807..a2cecb7223 100644 --- a/libavcodec/g729_parser.c +++ b/libavcodec/g729_parser.c @@ -51,6 +51,12 @@ static int g729_parse(AVCodecParserContext *s1, AVCodecContext *avctx, s->duration = avctx->frame_size; } + if (!s->block_size) { + *poutbuf = buf; + *poutbuf_size = buf_size; + return buf_size; + } + if (!s->remaining) s->remaining = s->block_size; if (s->remaining <= buf_size) { |