diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-16 04:02:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 18:53:11 +0100 |
| commit | c4034e4e192e6e9db2c2362479b576d449af5ece (patch) | |
| tree | 410de1f9c03552be3f0ba1b4a5ca43103520ab21 /libavformat | |
| parent | d3e19509cf4350063711d7cdb069c11f2423d8a1 (diff) | |
| download | ffmpeg-c4034e4e192e6e9db2c2362479b576d449af5ece.tar.gz | |
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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/hlsenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |