RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit abbb466368)
This commit is contained in:
Andreas Rheinhardt 2019-12-26 11:53:28 +01:00
parent 119ed69bd5
commit 5efb7dc2b2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/smoothstreamingenc.c
View File

@ -333,12 +333,11 @@ static int ism_write_header(AVFormatContext *s)
goto fail; goto fail;
} }
ctx = avformat_alloc_context(); os->ctx = ctx = avformat_alloc_context();
if (!ctx || ff_copy_whiteblacklists(ctx, s) < 0) { if (!ctx || ff_copy_whiteblacklists(ctx, s) < 0) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
os->ctx = ctx;
ctx->oformat = oformat; ctx->oformat = oformat;
ctx->interrupt_callback = s->interrupt_callback; 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_int(&opts, "ism_lookahead", c->lookahead_count, 0);
av_dict_set(&opts, "movflags", "frag_custom", 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; goto fail;
} }
os->ctx_inited = 1; os->ctx_inited = 1;
avio_flush(ctx->pb); avio_flush(ctx->pb);
av_dict_free(&opts);
s->streams[i]->time_base = st->time_base; s->streams[i]->time_base = st->time_base;
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
c->has_video = 1; c->has_video = 1;