diff mbox

[FFmpeg-devel] avformat/hlsenc: Fix a memory leak when http_persistent is 1

Message ID 1513666703-9957-1-git-send-email-kjeyapal@akamai.com
State Accepted
Commit 3ac76d890d91905925a4d7f66a43e0023e13e149
Headers show

Commit Message

Jeyapal, Karthick Dec. 19, 2017, 6:58 a.m. UTC
From: Karthick Jeyapal <kjeyapal@akamai.com>

---
 libavformat/hlsenc.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Liu Steven Dec. 19, 2017, 8:49 a.m. UTC | #1
> On 19 Dec 2017, at 14:58, Karthick J <kjeyapal@akamai.com> wrote:
> 
> From: Karthick Jeyapal <kjeyapal@akamai.com>
> 
> ---
> libavformat/hlsenc.c | 2 ++
> 1 file changed, 2 insertions(+)
> 
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index e3442c3..5ee28ea 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -1918,6 +1918,8 @@ static int hls_write_trailer(struct AVFormatContext *s)
>     av_freep(&vs->baseurl);
>     }
> 
> +    ff_format_io_close(s, &hls->m3u8_out);
> +    ff_format_io_close(s, &hls->sub_m3u8_out);
>     av_freep(&hls->key_basename);
>     av_freep(&hls->var_streams);
>     av_freep(&hls->master_m3u8_url);
> -- 
> 1.9.1
> 
> 


LGTM

Thanks

Steven
Liu Steven Dec. 21, 2017, 3:41 a.m. UTC | #2
> On 19 Dec 2017, at 16:49, 刘歧 <lq@chinaffmpeg.org> wrote:
> 
>> 
>> On 19 Dec 2017, at 14:58, Karthick J <kjeyapal@akamai.com> wrote:
>> 
>> From: Karthick Jeyapal <kjeyapal@akamai.com>
>> 
>> ---
>> libavformat/hlsenc.c | 2 ++
>> 1 file changed, 2 insertions(+)
>> 
>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>> index e3442c3..5ee28ea 100644
>> --- a/libavformat/hlsenc.c
>> +++ b/libavformat/hlsenc.c
>> @@ -1918,6 +1918,8 @@ static int hls_write_trailer(struct AVFormatContext *s)
>>    av_freep(&vs->baseurl);
>>    }
>> 
>> +    ff_format_io_close(s, &hls->m3u8_out);
>> +    ff_format_io_close(s, &hls->sub_m3u8_out);
>>    av_freep(&hls->key_basename);
>>    av_freep(&hls->var_streams);
>>    av_freep(&hls->master_m3u8_url);
>> -- 
>> 1.9.1
>> 
>> 
> 
> 
> LGTM
> 
> 

Pushed

Thanks
Jeyapal, Karthick Dec. 21, 2017, 5:36 a.m. UTC | #3
On 12/21/17 9:11 AM, 刘歧 wrote:
>
>> On 19 Dec 2017, at 16:49, 刘歧 <lq@chinaffmpeg.org> wrote:
>>
>>> On 19 Dec 2017, at 14:58, Karthick J <kjeyapal@akamai.com> wrote:
>>>
>>> From: Karthick Jeyapal <kjeyapal@akamai.com>
>>>
>>> ---
>>> libavformat/hlsenc.c | 2 ++
>>> 1 file changed, 2 insertions(+)
>>>
>>> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>>> index e3442c3..5ee28ea 100644
>>> --- a/libavformat/hlsenc.c
>>> +++ b/libavformat/hlsenc.c
>>> @@ -1918,6 +1918,8 @@ static int hls_write_trailer(struct AVFormatContext *s)
>>>     av_freep(&vs->baseurl);
>>>     }
>>>
>>> +    ff_format_io_close(s, &hls->m3u8_out);
>>> +    ff_format_io_close(s, &hls->sub_m3u8_out);
>>>     av_freep(&hls->key_basename);
>>>     av_freep(&hls->var_streams);
>>>     av_freep(&hls->master_m3u8_url);
>>> -- 
>>> 1.9.1
>>>
>>>
>>
>> LGTM
>>
>>
> Pushed
Thanks!
>
> Thanks
>
>
>
diff mbox

Patch

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index e3442c3..5ee28ea 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -1918,6 +1918,8 @@  static int hls_write_trailer(struct AVFormatContext *s)
     av_freep(&vs->baseurl);
     }
 
+    ff_format_io_close(s, &hls->m3u8_out);
+    ff_format_io_close(s, &hls->sub_m3u8_out);
     av_freep(&hls->key_basename);
     av_freep(&hls->var_streams);
     av_freep(&hls->master_m3u8_url);