From patchwork Thu Jan 5 00:20:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 2055 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp5071951vsb; Wed, 4 Jan 2017 16:22:30 -0800 (PST) X-Received: by 10.195.6.11 with SMTP id cq11mr56767769wjd.170.1483575749936; Wed, 04 Jan 2017 16:22:29 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x15si83352978wjq.98.2017.01.04.16.22.29; Wed, 04 Jan 2017 16:22:29 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7AB31689937; Thu, 5 Jan 2017 02:22:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg291.qq.com (smtpbg291.qq.com [113.108.11.223]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52342689E0B for ; Thu, 5 Jan 2017 02:22:14 +0200 (EET) X-QQ-mid: bizesmtp13t1483575629tlw9e98p Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Thu, 05 Jan 2017 08:20:24 +0800 (CST) X-QQ-SSF: 01100000002000F0F621000A0000000 X-QQ-FEAT: oIoGrveFQB8R4/QXPgRVclY22+jBNTEHVdeVo9LxpPZ7+PASJDAGM/n+Koq0t 8JkOVmygXYQxhj/guujqBsR7eE3CgmJfQ9UOAlNRbjLndIwekFr14ecPGMxmZhtJ/efEETr 8+N4U6ZcpKJVM5ECMG6cBDJAM4VaKCWbWNjTsJB8frBaEQX8gkCCaLrlWWRMp+N3pOpOez7 4bNLPdARv+/mHLCUIMfP/jpaLLAAJZIV2GhdPfgZaieSLO3qupdR2CBMHhp2k1HZDhW98ec If7g== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Jan 2017 08:20:22 +0800 Message-Id: <20170105002022.13822-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: fix memleak in hlsenc X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix CID: 1398364 Resource leak refine the code of the new options Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 808a797..feeb853 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -446,11 +446,18 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double if ((hls->flags & (HLS_SECOND_LEVEL_SEGMENT_SIZE | HLS_SECOND_LEVEL_SEGMENT_DURATION)) && strlen(hls->current_segment_final_filename_fmt)) { char * old_filename = av_strdup(hls->avf->filename); // %%s will be %s after strftime + if (!old_filename) { + av_free(en); + return AVERROR(ENOMEM); + } av_strlcpy(hls->avf->filename, hls->current_segment_final_filename_fmt, sizeof(hls->avf->filename)); + char * filename = av_strdup(hls->avf->filename); // %%s will be %s after strftime + if (!filename) { + av_free(old_filename); + av_free(en); + return AVERROR(ENOMEM); + } if (hls->flags & HLS_SECOND_LEVEL_SEGMENT_SIZE) { - char * filename = av_strdup(hls->avf->filename); // %%s will be %s after strftime - if (!filename) - return AVERROR(ENOMEM); if (replace_int_data_in_filename(hls->avf->filename, sizeof(hls->avf->filename), filename, 's', pos + size) < 1) { av_log(hls, AV_LOG_ERROR, @@ -459,14 +466,11 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double filename); av_free(filename); av_free(old_filename); + av_free(en); return AVERROR(EINVAL); } - av_free(filename); } if (hls->flags & HLS_SECOND_LEVEL_SEGMENT_DURATION) { - char * filename = av_strdup(hls->avf->filename); // %%t will be %t after strftime - if (!filename) - return AVERROR(ENOMEM); if (replace_int_data_in_filename(hls->avf->filename, sizeof(hls->avf->filename), filename, 't', (int64_t)round(1000000 * duration)) < 1) { av_log(hls, AV_LOG_ERROR, @@ -475,10 +479,11 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double filename); av_free(filename); av_free(old_filename); + av_free(en); return AVERROR(EINVAL); } - av_free(filename); } + av_free(filename); ff_rename(old_filename, hls->avf->filename, hls); av_free(old_filename); }