On Sat, Feb 03, 2018 at 10:13:28AM +0100, Paul B Mahol wrote:
> On 2/3/18, Nikolas Bowe <nbowe-at-google....@ffmpeg.org> wrote:
> > Previously if ff_outlink_frame_wanted() returned 0 it could dereference a
> > null pointer when trying to read nb_samples.
> > ---
> >  libavfilter/af_join.c | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
> > index cf5131e8dc..4f86e13558 100644
> > --- a/libavfilter/af_join.c
> > +++ b/libavfilter/af_join.c
> > @@ -485,6 +485,9 @@ static int activate(AVFilterContext *ctx)
> >                  return 0;
> >              }
> >          }
> > +        if (!s->input_frames[0]) {
> > +            return 0;
> > +        }
> >      }
> >
> >      nb_samples = s->input_frames[0]->nb_samples;
> > --
> > 2.16.0.rc1.238.g530d649a79-goog
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel@ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> 
> lgtm

will apply

thx

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

It is what and why we do it that matters, not just one of them.

Attachment: signature.asc
Description: PGP signature

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Reply via email to