[FFmpeg-devel] [PATCH 2/8] avformat/electronicarts: Check for EOF in each iteration of the loop in ea_read_packet()

[Michael Niedermayer]

On Sun, Oct 25, 2020 at 12:34:25PM +1100, Peter Ross wrote:
> On Sun, Oct 25, 2020 at 12:23:06AM +0200, Michael Niedermayer wrote:
> > Fixes: timeout(>20sec -> 1ms)
> > Fixes: 26526/clusterfuzz-testcase-minimized-ffmpeg_dem_EA_fuzzer-5672328069120000
> > 
> > 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/electronicarts.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
> > index d0f483aaf9..4c292f29a2 100644
> > --- a/libavformat/electronicarts.c
> > +++ b/libavformat/electronicarts.c
> > @@ -582,6 +582,8 @@ static int ea_read_packet(AVFormatContext *s, AVPacket *pkt)
> >      int av_uninit(num_samples);
> >  
> >      while ((!packet_read && !hit_end) || partial_packet) {
> > +        if (avio_feof(pb))
> > +            return AVERROR_EOF;
> >          chunk_type = avio_rl32(pb);
> >          chunk_size = ea->big_endian ? avio_rb32(pb) : avio_rl32(pb);
> >          if (chunk_size < 8)
> > -- 
> > 2.17.1
> 
> looks good

will apply

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Republics decline into democracies and democracies degenerate into
despotisms. -- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20201025/c15cf6ae/attachment.sig>