[FFmpeg-devel] [PATCH 2/4] avformat/vividas: Check for EOF in first loop in track_header()

[Michael Niedermayer]

On Mon, Sep 21, 2020 at 12:34:58AM +0200, Paul B Mahol wrote:
> On Sun, Sep 20, 2020 at 10:26:06PM +0200, Michael Niedermayer wrote:
> > Fixes: timeout (243sec -> a few ms)
> > Fixes: 25716/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5764093666131968
> > 
> > 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/vividas.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/libavformat/vividas.c b/libavformat/vividas.c
> > index 36c007b0d2..7917df5d64 100644
> > --- a/libavformat/vividas.c
> > +++ b/libavformat/vividas.c
> > @@ -293,6 +293,8 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s,  uint8_t *
> >  
> >      for (i=0;i<val_1;i++) {
> >          int c = avio_r8(pb);
> > +        if (avio_feof(pb))
> > +            return AVERROR_EOF;
> >          for (j=0;j<c;j++) {
> >              if (avio_feof(pb))
> >                  return AVERROR_EOF;
> > -- 
> 
> Generally acceptable.

will apply

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If the United States is serious about tackling the national security threats 
related to an insecure 5G network, it needs to rethink the extent to which it
values corporate profits and government espionage over security.-Bruce Schneier
-------------- 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/20200921/998e5476/attachment.sig>