[FFmpeg-cvslog] avformat/cache: Fix memleak of tree entries

Michael Niedermayer git at videolan.org
Sat Mar 26 22:36:04 CET 2016


ffmpeg | branch: release/3.0 | Michael Niedermayer <michael at niedermayer.cc> | Wed Mar  2 14:09:23 2016 +0100| [b4be953c559699986c63c68e2c2e9e927201d4c2] | committer: Michael Niedermayer

avformat/cache: Fix memleak of tree entries

Found-by: jamrial

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 554f6e930ce05a4c5449efcaae36bdafe2d9de74)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/cache.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavformat/cache.c b/libavformat/cache.c
index 8e8b9e8..8aed37e 100644
--- a/libavformat/cache.c
+++ b/libavformat/cache.c
@@ -283,6 +283,12 @@ resolve_eof:
     return ret;
 }
 
+static int enu_free(void *opaque, void *elem)
+{
+    av_free(elem);
+    return 0;
+}
+
 static int cache_close(URLContext *h)
 {
     Context *c= h->priv_data;
@@ -292,6 +298,7 @@ static int cache_close(URLContext *h)
 
     close(c->fd);
     ffurl_close(c->inner);
+    av_tree_enumerate(c->root, NULL, NULL, enu_free);
     av_tree_destroy(c->root);
 
     return 0;



More information about the ffmpeg-cvslog mailing list