From 2aee5a87233277027bb281372f888b5246a58e77 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Mon, 25 Dec 2017 23:51:25 +0800 Subject: avformat/hlsenc: fix resource leak fix CID: 1426931 1426929 --- libavformat/hlsenc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libavformat') diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index b850b1a320..74f66ce6bd 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1899,11 +1899,13 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Failed to open file '%s'\n", vs->avf->filename); + av_free(old_filename); return ret; } write_styp(vs->out); ret = flush_dynbuf(vs, &range_length); if (ret < 0) { + av_free(old_filename); return ret; } ff_format_io_close(s, &vs->out); @@ -1979,16 +1981,17 @@ static int hls_write_trailer(struct AVFormatContext *s) ret = hlsenc_io_open(s, &vs->out, vs->avf->filename, NULL); if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "Failed to open file '%s'\n", vs->avf->filename); - return AVERROR(ENOENT); + goto failed; } write_styp(vs->out); ret = flush_dynbuf(vs, &range_length); if (ret < 0) { - return ret; + goto failed; } ff_format_io_close(s, &vs->out); } +failed: av_write_trailer(oc); if (oc->pb) { vs->size = avio_tell(vs->avf->pb) - vs->start_pos; -- cgit v1.2.3