[FFmpeg-cvslog] avformat/utils: fix memory leak in avformat_free_context

Steven Siloti git at videolan.org
Sun Sep 17 13:55:08 EEST 2017


ffmpeg | branch: release/3.2 | Steven Siloti <ssiloti at bittorrent.com> | Tue Jul 18 11:26:39 2017 -0700| [16ee4057077b05e89a784cce1a17ec49b5e46ad2] | committer: Michael Niedermayer

avformat/utils: fix memory leak in avformat_free_context

The pointer to the packet queue is stored in the internal structure
so the queue needs to be flushed before internal is freed.

Signed-off-by: Steven Siloti <ssiloti at bittorrent.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 949debd1d1df3a96315b3a3083831162845c1188)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16ee4057077b05e89a784cce1a17ec49b5e46ad2
---

 libavformat/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index cea3ab5a93..3e59e50bb1 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4172,8 +4172,8 @@ void avformat_free_context(AVFormatContext *s)
     av_freep(&s->chapters);
     av_dict_free(&s->metadata);
     av_freep(&s->streams);
-    av_freep(&s->internal);
     flush_packet_queue(s);
+    av_freep(&s->internal);
     av_free(s);
 }
 



More information about the ffmpeg-cvslog mailing list