OSDN Git Service

avformat/hlsenc: Free context after hls_append_segment
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Nov 2014 03:02:56 +0000 (04:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 17:53:11 +0000 (18:53 +0100)
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>
libavformat/hlsenc.c

index dcd53e5..6f5fe1e 100644 (file)
@@ -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);