[FFmpeg-cvslog] avformat/smoothstreaming: Fix memleaks on errors
Andreas Rheinhardt
git at videolan.org
Wed May 20 08:37:36 EEST 2020
ffmpeg | branch: release/4.2 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Thu Dec 26 11:53:28 2019 +0100| [5efb7dc2b2e437b201d3e6e28b2d2c7e121dc28b] | committer: Andreas Rheinhardt
avformat/smoothstreaming: Fix memleaks on errors
If an AVFormatContext could be allocated, but white-/blacklists couldn't
be copied, the AVFormatContext would leak as it was only accessible
through a local variable that goes out of scope when one goes to fail.
Furthermore, in case writing a header of a submuxer failed, the options
used for said call could leak.
Both of these memleaks have been fixed.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit abbb466368c51285ca27d5e3959a16a9591e9a4c)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5efb7dc2b2e437b201d3e6e28b2d2c7e121dc28b
---
libavformat/smoothstreamingenc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index 1ed19ebb2f..78c3000040 100644
--- a/libavformat/smoothstreamingenc.c
+++ b/libavformat/smoothstreamingenc.c
@@ -333,12 +333,11 @@ static int ism_write_header(AVFormatContext *s)
goto fail;
}
- ctx = avformat_alloc_context();
+ os->ctx = ctx = avformat_alloc_context();
if (!ctx || ff_copy_whiteblacklists(ctx, s) < 0) {
ret = AVERROR(ENOMEM);
goto fail;
}
- os->ctx = ctx;
ctx->oformat = oformat;
ctx->interrupt_callback = s->interrupt_callback;
@@ -358,12 +357,13 @@ static int ism_write_header(AVFormatContext *s)
av_dict_set_int(&opts, "ism_lookahead", c->lookahead_count, 0);
av_dict_set(&opts, "movflags", "frag_custom", 0);
- if ((ret = avformat_write_header(ctx, &opts)) < 0) {
+ ret = avformat_write_header(ctx, &opts);
+ av_dict_free(&opts);
+ if (ret < 0) {
goto fail;
}
os->ctx_inited = 1;
avio_flush(ctx->pb);
- av_dict_free(&opts);
s->streams[i]->time_base = st->time_base;
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
c->has_video = 1;
More information about the ffmpeg-cvslog
mailing list