ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@gmail.com> | Fri Mar 27 05:31:13 2020 +0100| [de0b04551da4e1470ce1c99321a768887df8c650] | committer: Andreas Rheinhardt
avformat/avidec: Fix memleak when allocating DVDemuxContext fails An AVIStream (intended to be used as private data for an AVStream) would leak in this scenario. Also return a more fitting error code instead of AVERROR_INVALIDDATA. Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de0b04551da4e1470ce1c99321a768887df8c650 --- libavformat/avidec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 18402f0032..87298513c2 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -605,9 +605,12 @@ static int avi_read_header(AVFormatContext *s) ast = s->streams[0]->priv_data; st->priv_data = NULL; ff_free_stream(s, st); - avi->dv_demux = avpriv_dv_init_demux(s); - if (!avi->dv_demux) - goto fail; + + avi->dv_demux = avpriv_dv_init_demux(s); + if (!avi->dv_demux) { + av_free(ast); + return AVERROR(ENOMEM); + } s->streams[0]->priv_data = ast; avio_skip(pb, 3 * 4); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
