From 972a0a818ff7a9b33c7f37e08783f4b6082f9aa2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 25 Sep 2019 01:07:34 +0200 Subject: 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 Signed-off-by: Michael Niedermayer --- libavcodec/g729_parser.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libavcodec/g729_parser.c') diff --git a/libavcodec/g729_parser.c b/libavcodec/g729_parser.c index 5a57025d62..010f688104 100644 --- a/libavcodec/g729_parser.c +++ b/libavcodec/g729_parser.c @@ -53,6 +53,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) { -- cgit v1.2.3