[FFmpeg-devel] [PATCH 1/3] vf_colorspace: Check av_frame_copy_props() return value

[Michael Niedermayer]

On Fri, Aug 26, 2016 at 12:59:34AM -0400, Ronald S. Bultje wrote:
> Hi,
> 
> On Thu, Aug 25, 2016 at 7:14 PM, Vittorio Giovara <
> vittorio.giovara at gmail.com> wrote:
> 
> > This function can potentially allocate memory.
> > ---
> > Please keep me in CC.
> > Vittorio
> >
> >  libavfilter/vf_colorspace.c | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c
> > index 3d39f13..bf51c83 100644
> > --- a/libavfilter/vf_colorspace.c
> > +++ b/libavfilter/vf_colorspace.c
> > @@ -861,7 +861,11 @@ static int filter_frame(AVFilterLink *link, AVFrame
> > *in)
> >          av_frame_free(&in);
> >          return AVERROR(ENOMEM);
> >      }
> > -    av_frame_copy_props(out, in);
> > +    res = av_frame_copy_props(out, in);
> > +    if (res < 0) {
> > +        av_frame_free(&in);
> > +        return res;
> > +    }
> >
> >      out->color_primaries = s->user_prm == AVCOL_PRI_UNSPECIFIED ?
> >                             default_prm[FFMIN(s->user_all, CS_NB)] :
> > s->user_prm;
> > --
> > 2.9.3
> 
> 
> OK.

applied

thx

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

When you are offended at any man's fault, turn to yourself and study your
own failings. Then you will forget your anger. -- Epictetus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160827/a0b94cd6/attachment.sig>