[vlc-commits] demux: adaptative: fix access after free/delete ordering

Francois Cartegnie git at videolan.org
Mon Nov 2 16:41:18 CET 2015


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Nov  2 16:39:14 2015 +0100| [044bfb968f5d602ff787175ed90dcb14b13a9a1e] | committer: Francois Cartegnie

demux: adaptative: fix access after free/delete ordering

delete connection manager last,
streams will want to close unfinished downloads

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=044bfb968f5d602ff787175ed90dcb14b13a9a1e
---

 modules/demux/adaptative/PlaylistManager.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/adaptative/PlaylistManager.cpp b/modules/demux/adaptative/PlaylistManager.cpp
index 3f2153d..50936af 100644
--- a/modules/demux/adaptative/PlaylistManager.cpp
+++ b/modules/demux/adaptative/PlaylistManager.cpp
@@ -60,10 +60,10 @@ PlaylistManager::PlaylistManager( demux_t *p_demux_,
 
 PlaylistManager::~PlaylistManager   ()
 {
-    delete conManager;
     delete streamFactory;
     unsetPeriod();
     delete playlist;
+    delete conManager;
 }
 
 void PlaylistManager::unsetPeriod()



More information about the vlc-commits mailing list