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

rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded 

By making sure we at each time only have one pointer set, either a
local variable or one in the context, we avoid potential double frees
in the cleanup routines. If chain->rtp_ctx is set, it is closed by
calling avformat_write_trailer, but that shouldn't be called unless
avformat_write_header succeeded.

This issue was pointed out by Andreas Cadhalpun.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit cf402d6fa8)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Martin Storsjö 2015-03-09 23:14:19 +02:00 committed by Andreas Cadhalpun
parent c3b1261afa
commit 692fd5635f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/rtpenc_mpegts.c
View File

@ -88,11 +88,10 @@ static int rtp_mpegts_write_header(AVFormatContext *s)
st->time_base.num = 1;
st->time_base.den = 90000;
st->codec->codec_id = AV_CODEC_ID_MPEG2TS;
chain->rtp_ctx = rtp_ctx;
rtp_ctx->pb = s->pb;
if ((ret = avformat_write_header(rtp_ctx, NULL)) < 0)
goto fail;
rtp_ctx = NULL;
chain->rtp_ctx = rtp_ctx;
return 0;