[FFmpeg-devel] [PATCH] avformat/nutenc: Do not pass NULL to memcmp() in get_needed_flags()

[Michael Niedermayer]

On Fri, Nov 01, 2019 at 11:22:41AM +0100, Andreas Rheinhardt wrote:
> On Fri, Nov 1, 2019 at 10:42 AM Michael Niedermayer <michael at niedermayer.cc>
> wrote:
> 
> > This compared to the other suggestions is cleaner and easer to understand
> > keeping the condition in the if() simple
> >
> > See: [FFmpeg-devel] [PATCH] avformat/nutenc: Fix memleak
> > See: [FFmpeg-devel] [PATCH]lavf/nutenc: Do not call memcmp() with NULL
> > argument
> >
> > Fixes: Ticket 7980
> >
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavformat/nutenc.c | 11 ++++++-----
> >  1 file changed, 6 insertions(+), 5 deletions(-)
> >
> > diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
> > index d212f0c245..46dce7722d 100644
> > --- a/libavformat/nutenc.c
> > +++ b/libavformat/nutenc.c
> > @@ -792,11 +792,12 @@ static int get_needed_flags(NUTContext *nut,
> > StreamContext *nus, FrameCode *fc,
> >          flags |= FLAG_CHECKSUM;
> >      if (FFABS(pkt->pts - nus->last_pts) > nus->max_pts_distance)
> >          flags |= FLAG_CHECKSUM;
> > -    if (pkt->size < nut->header_len[fc->header_idx] ||
> > -        (pkt->size > 4096 && fc->header_idx)        ||
> > -        memcmp(pkt->data, nut->header[fc->header_idx],
> > -               nut->header_len[fc->header_idx]))
> > -        flags |= FLAG_HEADER_IDX;
> > +    if (fc->header_idx)
> > +        if (pkt->size < nut->header_len[fc->header_idx] ||
> > +            pkt->size > 4096                            ||
> > +            memcmp(pkt->data, nut->header    [fc->header_idx],
> > +                              nut->header_len[fc->header_idx]))
> > +            flags |= FLAG_HEADER_IDX;
> >
> >      return flags | (fc->flags & FLAG_CODED);
> >  }
> > --
> > 2.23.0
> >
> >
> The reference to  [FFmpeg-devel] [PATCH] avformat/nutenc: Fix memleak is
> inappropriate.

yes, oops that was a copy and paste error
fixed locally


> Carl's patch was titled "[FFmpeg-devel] lavf/nutenc: Do not call memcmp()
> with NULL argument".

Its copy and pasted from here:
179255     0701  1:12 Carl Eugen Hoyo (2,2K) [FFmpeg-devel] [PATCH]lavf/nutenc: Do not call memcmp() with NULL argument

iam not sure what you refer to, but theres a [PATCH] in the subject with a
missing space and the reference should duplicate that if theres a reference


> You could also mention that this affected lots of fate-tests. 

will do


> And "easer"
> is missing an "i".

will correct


> I have no objections apart from that. I didn't test your code, but it looks
> fine.

ok, ill wait a bit more in case others want to comment or test

Thanks!

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Concerning the gods, I have no means of knowing whether they exist or not
or of what sort they may be, because of the obscurity of the subject, and
the brevity of human life -- Protagoras
-------------- 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/20191101/48fda3fb/attachment.sig>