ffmpeg | branch: release/2.1 | Michael Niedermayer <michae...@gmx.at> | Sun Nov
16 04:02:56 2014 +0100| [c4034e4e192e6e9db2c2362479b576d449af5ece] | committer:
Michael Niedermayer
avformat/hlsenc: Free context after hls_append_segment
Fixes reading uninitialized memory
Signed-off-by: Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4034e4e192e6e9db2c2362479b576d449af5ece
---
libavformat/hlsenc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index dcd53e5..6f5fe1e 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);
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
