[FFmpeg-devel] [PATCH 4/8] avformat/mxfdec: cleanup on "essence prior to first PartitionPack"

Michael Niedermayer michael at niedermayer.cc
Thu Nov 7 19:06:29 EET 2019


On Wed, Nov 06, 2019 at 09:38:01PM +0100, Tomas Härdin wrote:
> tor 2019-10-31 klockan 18:58 +0100 skrev Michael Niedermayer:
> > Fixes: memleak
> > Fixes: 18473/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-
> > 5738557074833408
> > 
> > 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/mxfdec.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
> > index 397f820b3f..f3b1b704f9 100644
> > --- a/libavformat/mxfdec.c
> > +++ b/libavformat/mxfdec.c
> > @@ -3199,7 +3199,8 @@ static int mxf_read_header(AVFormatContext *s)
> >  
> >              if (!mxf->current_partition) {
> >                  av_log(mxf->fc, AV_LOG_ERROR, "found essence prior
> > to first PartitionPack\n");
> > -                return AVERROR_INVALIDDATA;
> > +                ret = AVERROR_INVALIDDATA;
> > +                goto fail;
> 
> Should be OK. I'd add a comment around mxf_read_sync() why we don't
> goto fail there (since no metadata sets will have been parsed yet)

will add and apply

thanks

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

"I am not trying to be anyone's saviour, I'm trying to think about the
 future and not be sad" - Elon Musk

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20191107/87732ae7/attachment.sig>


More information about the ffmpeg-devel mailing list