ffmpeg | branch: release/2.3 | Michael Niedermayer <michae...@gmx.at> | Sun Nov
16 04:02:56 2014 +0100| [693d0d3ac520b5bd516b4c9165e9b04f6623d45e] | 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
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=693d0d3ac520b5bd516b4c9165e9b04f6623d45e
---
libavformat/hlsenc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 388a23a..313fcd3 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -314,9 +314,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
