[FFmpeg-devel] [PATCH 4/4] avcodec/g729_parser: Check block_size

Paul B Mahol onemda at gmail.com
Wed Sep 25 13:39:10 EEST 2019


lgtm

On 9/25/19, Michael Niedermayer <michael at niedermayer.cc> wrote:
> 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
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavcodec/g729_parser.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> 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) {
> --
> 2.23.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".


More information about the ffmpeg-devel mailing list