From patchwork Mon Mar 12 06:34:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 7946 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1257446jad; Sun, 11 Mar 2018 23:35:27 -0700 (PDT) X-Google-Smtp-Source: AG47ELuPWgD2L4wVQf0+J6beLkvB9aWb2mAWRKXkrpTvoS3a8hhZj8SuWrKbXEBN8eYOQdGufmjH X-Received: by 10.223.136.56 with SMTP id d53mr5033133wrd.17.1520836527047; Sun, 11 Mar 2018 23:35:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520836526; cv=none; d=google.com; s=arc-20160816; b=vO2tIVEzDpdXumNdPc5uE+datHyeJOn9VlMZjYRhA+9Pm9nX1darRV6oxbHc4NnyRj okgqv/g6qpNwSnr/3tgFxTIEzl2r4TVj+Iw4hWxP8oqIKIVv5CBnZzz6/lqPedYuKGPz WAaaQhCOVCzb9/b0TxknkOBZn30bk9U+PKUssy829aweZtTfZEg/Fd0P43gDRfuCenA/ x1NznmOcgim1KjhWjb4PFesiOJFIXoMJnoX3IWgcjtXqKrXkmAgL7+yAKbDN2i3iOOUS OFXCTNqUgQuZEWLF7WmPr/xgAQup9Nk1ldSDEiIAf8HA29sVdKByvr4whwim53HfAcOM q4RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :delivered-to:arc-authentication-results; bh=2jvwS2NdLP5z4xyxRil8hgkyThdRGYvaQtmhbdfwPz0=; b=usFnCXC2Hcrpohwt2MV9eEWx6cmLPaFC9O/WZ2yKTMDmLL+VNJesI+jYBxoeHkruk3 QaIqr6QB1EiTDnyQoOCBbcdJ3i4IlUWy+o6yONq/dgeFIklVpQ4FkjBn8NCnR2GKngg3 g/lkYZaf/ieBI4+nMVYPXE2aruxAZxXpNyODXXMFaMAnznOQPexYbnUH0QiWGTQhUyHW AnWcLIx4W4wOjcp9bM7PpSTqi5Gk+2YHorr7ki3Q48FlOjIfpjmpaXb7dHp8Z1mC/zrH vMQ2Sy5W0JosvzrBOyEg4XMhwfSgt29BdDMH1yFk9pKCu73O52Rs2Fe3r4EZryP5NFJK Bwtg== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p25si2696450wmc.55.2018.03.11.23.35.26; Sun, 11 Mar 2018 23:35:26 -0700 (PDT) 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 F19B768A44F; Mon, 12 Mar 2018 08:35:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau2.qq.com (smtpbgau2.qq.com [54.206.34.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F029068A32D for ; Mon, 12 Mar 2018 08:34:57 +0200 (EET) X-QQ-mid: bizesmtp15t1520836501tbn029f1 Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 12 Mar 2018 14:35:01 +0800 (CST) X-QQ-SSF: 01600000004000F0FKF0B00A0000000 X-QQ-FEAT: +c2Kczbw9d1v4Yx5RGH2wvHtdd/s50rM+6J55UhKQ5GiWyzEVB14bIRKc/mUK kdwJ3JCFcUV5I1iNd59C7ZhKTmjfxwnuPRb7auZw0J3j+KnllQoE3UEQquPDNE4lx4vNhwi ugUu9y8IED/v7DjWslwJfzap48jhWXjJUP92tz/RQoVIOWvjoW2/s+9cUFl16K5nwY7FdM5 nN9FBb23x5LXpQX+TRgNMDvw6qHMOcN1gg2EwQHoSgnFj/GGb2Anl5L8/kSbmGWx8EdjfQ6 uLrxB5sJbxDV378DXjdtl0ombsSdsLnxwd6Q== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Mar 2018 14:34:59 +0800 Message-Id: <20180312063459.14030-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 3/5] avformat/hlsenc: fix memleak problem about fmp4_init_filename 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" move fmp4_init_filename init in if else for first fmp4_init_filename set value operation. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 7ca4099e7e..ad9f4d3394 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2574,6 +2574,13 @@ static int hls_init(AVFormatContext *s) if (hls->segment_type == SEGMENT_TYPE_FMP4) { if (hls->nb_varstreams > 1) fmp4_init_filename_len += strlen(POSTFIX_PATTERN); + if (hls->flags & HLS_SINGLE_FILE) { + vs->fmp4_init_filename = av_strdup(vs->basename); + if (!vs->fmp4_init_filename) { + ret = AVERROR(ENOMEM); + goto fail; + } + } else { vs->fmp4_init_filename = av_malloc(fmp4_init_filename_len); if (!vs->fmp4_init_filename ) { ret = AVERROR(ENOMEM); @@ -2607,6 +2614,7 @@ static int hls_init(AVFormatContext *s) av_strlcpy(vs->base_output_dirname, vs->fmp4_init_filename, fmp4_init_filename_len); } + } } if (!hls->use_localtime) { @@ -2661,13 +2669,6 @@ static int hls_init(AVFormatContext *s) } } - if ((hls->flags & HLS_SINGLE_FILE) && (hls->segment_type == SEGMENT_TYPE_FMP4)) { - vs->fmp4_init_filename = av_strdup(vs->basename); - if (!vs->fmp4_init_filename) { - ret = AVERROR(ENOMEM); - goto fail; - } - } if ((ret = hls_mux_init(s, vs)) < 0) goto fail;