[vlc-commits] demux: adaptative: fix use after free (cid #1346995)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Dec 31 14:19:12 2015 +0100| [e7874f136f99b527cf9420bc77a48d3e981ceb45] | committer: Francois Cartegnie

demux: adaptative: fix use after free (cid #1346995)

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

 modules/demux/adaptative/playlist/SegmentInformation.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/demux/adaptative/playlist/SegmentInformation.cpp b/modules/demux/adaptative/playlist/SegmentInformation.cpp
index f14791b..a07d3a0 100644
--- a/modules/demux/adaptative/playlist/SegmentInformation.cpp
+++ b/modules/demux/adaptative/playlist/SegmentInformation.cpp
@@ -467,7 +467,8 @@ void SegmentInformation::setSegmentTemplate(MediaSegmentTemplate *templ)
         mediaSegmentTemplate->mergeWith(templ, 0);
         delete templ;
     }
-    mediaSegmentTemplate = templ;
+    else
+        mediaSegmentTemplate = templ;
 }
 
 static void insertIntoSegment(std::vector<ISegment *> &seglist, size_t start,