diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-09-25 01:07:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-31 19:51:55 +0100 |
| commit | 1493a952ed236c7339566a8cdd42d314fe3184e7 (patch) | |
| tree | 727d6165b71ec91eaff06baf440c39f646e9f85e /libavcodec | |
| parent | c0f315b835174493db2def644df8962149eedcd8 (diff) | |
| download | ffmpeg-1493a952ed236c7339566a8cdd42d314fe3184e7.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')
| -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 9982dbfffc..fc00235d7f 100644 --- a/libavcodec/g729_parser.c +++ b/libavcodec/g729_parser.c @@ -52,6 +52,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) { |