eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 10:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

avformat/segment: Fix leak of string on error

Browse Source 
A string containing the segment's filename that the segment muxer
allocates got only freed in its write_trailer function. This implies
that it leaks if write_trailer is never called, e.g. if initializing
the child muxer fails. This commit fixes this by freeing the string
in the deinit function instead.

Reviewed-by: Ridley Combs <rcombs@rcombs.me>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 3152a2a218)
This commit is contained in:
Andreas Rheinhardt
2020-09-05 21:22:21 +02:00
parent 2c8f99deb8
commit 021e1aa6b8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/segment.c
View File

@@ -664,6 +664,7 @@ static void seg_free(AVFormatContext *s)
seg->avf = NULL; seg->avf = NULL;
av_freep(&seg->times); av_freep(&seg->times);
av_freep(&seg->frames); av_freep(&seg->frames);
av_freep(&seg->cur_entry.filename);
} }
static int seg_init(AVFormatContext *s) static int seg_init(AVFormatContext *s)
@@ -983,7 +984,6 @@ fail:
ff_format_io_close(s, &seg->list_pb); ff_format_io_close(s, &seg->list_pb);
av_opt_free(seg); av_opt_free(seg);
av_freep(&seg->cur_entry.filename);
cur = seg->segment_list_entries; cur = seg->segment_list_entries;
while (cur) { while (cur) {