[FFmpeg-devel] [PATCH 6/6] avformat/wtvdec: Check length of read mpeg2_descriptor

[Michael Niedermayer]

On Wed, Aug 07, 2024 at 10:02:09AM +1000, Peter Ross wrote:
> On Wed, Aug 07, 2024 at 12:18:53AM +0200, Michael Niedermayer wrote:
> > Fixes: Use of uninitialized value
> > Fixes: 70900/clusterfuzz-testcase-minimized-ffmpeg_dem_WTV_fuzzer-6286909377150976
> > 
> > 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/wtvdec.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
> > index 1a6c4c33481..730c7fca783 100644
> > --- a/libavformat/wtvdec.c
> > +++ b/libavformat/wtvdec.c
> > @@ -846,7 +846,8 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p
> >                  }
> >  
> >                  buf_size = FFMIN(len - consumed, sizeof(buf));
> > -                avio_read(pb, buf, buf_size);
> > +                if (avio_read(pb, buf, buf_size) != buf_size)
> > +                    return AVERROR_INVALIDDATA;
> >                  consumed += buf_size;
> >                  ff_parse_mpeg2_descriptor(s, st, 0, &pbuf, buf + buf_size, NULL, 0, 0, NULL);
> >              }
> 
> please apply

will apply

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Its not that you shouldnt use gotos but rather that you should write
readable code and code with gotos often but not always is less readable
-------------- 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/20240808/2d8866e1/attachment.sig>