From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 16 Nov 2014 03:02:56 +0000 (+0100)
Subject: avformat/hlsenc: Free context after hls_append_segment
X-Git-Tag: android-x86-4.4-r2^2~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c4034e4e192e6e9db2c2362479b576d449af5ece;p=android-x86%2Fexternal-ffmpeg.git

avformat/hlsenc: Free context after hls_append_segment

Fixes reading uninitialized memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 530eb6acf8ee867bf00728bf7efaf505da107e17)

Conflicts:

	libavformat/hlsenc.c
(cherry picked from commit 0ac22f043bee2f1c4daf5e1044b014326325d929)

Conflicts:

	libavformat/hlsenc.c
(cherry picked from commit 134d3e1c0331462ea94c78a5e13a63b20d283653)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index dcd53e5f40..6f5fe1eb87 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -306,9 +306,10 @@ static int hls_write_trailer(struct AVFormatContext *s)
 
     av_write_trailer(oc);
     avio_closep(&oc->pb);
-    avformat_free_context(oc);
     av_free(hls->basename);
     append_entry(hls, hls->duration);
+    avformat_free_context(oc);
+    hls->avf = NULL;
     hls_window(s, 1);
 
     free_entries(hls);