[FFmpeg-devel] [PATCH 1/6] avformat/mxfdec: Do not clear arrays in mxf_read_index_entry_array()

Michael Niedermayer michael at niedermayer.cc
Mon Dec 28 20:35:32 EET 2020


On Sun, Dec 27, 2020 at 07:11:19PM +0100, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > They are written too immediately, so it should not be needed.
> > 
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavformat/mxfdec.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
> > index 1f79f3d3cd..f5472525ff 100644
> > --- a/libavformat/mxfdec.c
> > +++ b/libavformat/mxfdec.c
> > @@ -1088,9 +1088,9 @@ static int mxf_read_index_entry_array(AVIOContext *pb, MXFIndexTableSegment *seg
> >      if(segment->nb_index_entries && length < 11)
> >          return AVERROR_INVALIDDATA;
> >  
> > -    if (!(segment->temporal_offset_entries=av_calloc(segment->nb_index_entries, sizeof(*segment->temporal_offset_entries))) ||
> > -        !(segment->flag_entries          = av_calloc(segment->nb_index_entries, sizeof(*segment->flag_entries))) ||
> > -        !(segment->stream_offset_entries = av_calloc(segment->nb_index_entries, sizeof(*segment->stream_offset_entries)))) {
> > +    if (!(segment->temporal_offset_entries=av_malloc_array(segment->nb_index_entries, sizeof(*segment->temporal_offset_entries))) ||
> > +        !(segment->flag_entries          = av_malloc_array(segment->nb_index_entries, sizeof(*segment->flag_entries))) ||
> > +        !(segment->stream_offset_entries = av_malloc_array(segment->nb_index_entries, sizeof(*segment->stream_offset_entries)))) {
> >          av_freep(&segment->temporal_offset_entries);
> >          av_freep(&segment->flag_entries);
> >          return AVERROR(ENOMEM);
> > 
> Maybe use FF_ALLOC_TYPED_ARRAY? Anyway, both the current as well as your
> proposed version don't have spaces around the first assignment and the
> assignments are not properly aligned.

will apply with these changes

thx

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

No snowflake in an avalanche ever feels responsible. -- Voltaire
-------------- 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/20201228/623598ae/attachment.sig>


More information about the ffmpeg-devel mailing list