[FFmpeg-devel] [PATCH 3/3] avformat/flvdec: Check for EOF in amf_parse_object()

Steven Liu lq at chinaffmpeg.org
Fri Oct 9 17:37:20 EEST 2020



> 在 2020年10月9日,03:19,Michael Niedermayer <michael at niedermayer.cc> 写道:
> 
> Fixes: Timeout (too long -> 1ms)
> Fixes: 26108/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5653887668977664
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
> libavformat/flvdec.c | 3 +++
> 1 file changed, 3 insertions(+)
> 
> diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
> index d480d0bc67..e6786e8b38 100644
> --- a/libavformat/flvdec.c
> +++ b/libavformat/flvdec.c
> @@ -493,8 +493,11 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
>     double num_val;
>     amf_date date;
> 
> +
empty line?
>     num_val  = 0;
>     ioc      = s->pb;
> +    if (avio_feof(ioc))
> +        return AVERROR_EOF;
>     amf_type = avio_r8(ioc);
> 
>     switch (amf_type) {
> -- 
> 2.17.1
> 
> _______________________________________________
> 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".

Thanks
Steven






More information about the ffmpeg-devel mailing list