[FFmpeg-devel] [PATCH] avformat/ifv: Check for EOF in read_index()

[Peter Ross]

On Thu, Jul 18, 2019 at 01:42:23AM +0200, Michael Niedermayer wrote:
> Fixes: Timeout
> Fixes: 15567/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5758451487080448
> 
> 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/ifv.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/libavformat/ifv.c b/libavformat/ifv.c
> index 6acbb29a75..f95e9b0e52 100644
> --- a/libavformat/ifv.c
> +++ b/libavformat/ifv.c
> @@ -68,6 +68,8 @@ static int read_index(AVFormatContext *s,
>      }
>  
>      for (i = start_index; i < end_index; i++) {
> +        if (avio_feof(s->pb))
> +            return AVERROR_EOF;
>          pos = avio_rl32(s->pb);
>          size = avio_rl32(s->pb);
>  

i approve.

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20190719/50307997/attachment.sig>