diff options
| author | Zhao Zhili <quinkblack@foxmail.com> | 2020-06-28 11:15:39 +0800 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-01 15:50:18 +0200 |
| commit | bd51c9dfaf82e9789273b6524cd61647e45c9fcc (patch) | |
| tree | 200d796fe8e2f05452cfc68ac3d7e564c636a10f | |
| parent | e26c58d8e023aab157c3d1828109a4128b8b6915 (diff) | |
| download | ffmpeg-bd51c9dfaf82e9789273b6524cd61647e45c9fcc.tar.gz | |
avformat/mov: fix memleaks
Fix two cases of memleaks:
1. The leak of dv_demux
2. The leak of dv_fctx upon dv_demux allocate failure
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit f3dc38a186b2326ce03e50969897ea703817ddb0)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/mov.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index e01fe1a137..c9740bfa2b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5378,10 +5378,9 @@ static int mov_read_close(AVFormatContext *s) av_aes_ctr_free(sc->cenc.aes_ctr); } - if (mov->dv_demux) { - avformat_free_context(mov->dv_fctx); - mov->dv_fctx = NULL; - } + av_freep(&mov->dv_demux); + avformat_free_context(mov->dv_fctx); + mov->dv_fctx = NULL; if (mov->meta_keys) { for (i = 1; i < mov->meta_keys_count; i++) { |