[FFmpeg-devel] [PATCH 1/2] avcodec/dcaadpcm: check for av_malloc() failure

foo86 foobaz86 at gmail.com
Sun Jul 23 00:38:23 EEST 2017


On Sat, Jul 22, 2017 at 07:55:05PM +0200, Nicolas George wrote:
> Le quartidi 4 thermidor, an CCXXV, foo86 a écrit :
> > Fixes CID 1409915.
> > ---
> >  libavcodec/dcaadpcm.c | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/libavcodec/dcaadpcm.c b/libavcodec/dcaadpcm.c
> > index 8742c7ccf6..e00f81f011 100644
> > --- a/libavcodec/dcaadpcm.c
> > +++ b/libavcodec/dcaadpcm.c
> > @@ -215,6 +215,9 @@ av_cold int ff_dcaadpcm_init(DCAADPCMEncContext *s)
> >          return -1;
> >  
> >      s->private_data = av_malloc(sizeof(premultiplied_coeffs) * DCA_ADPCM_VQCODEBOOK_SZ);
> > +    if (!s->private_data)
> 
> > +        return -1;
> 
> Proper return code please. Even if it is unused by the surrounding code,
> it will make maintenance easier.

Changed to AVERROR(ENOMEM) and pushed, thanks.

> (There is another -1 just above, wrong too. It should be replaced by
> "av_assert1(s);", but that is not important since it cannot be reached.)


More information about the ffmpeg-devel mailing list