From patchwork Wed Oct 23 15:55:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15921 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1A07E4481F2 for ; Wed, 23 Oct 2019 18:55:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF49768AFD8; Wed, 23 Oct 2019 18:55:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D86968AFA7 for ; Wed, 23 Oct 2019 18:55:27 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id u23so1710439pgo.0 for ; Wed, 23 Oct 2019 08:55:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2ZAG78zEuHmt5lSV68vPf9nLmj+AlZTX60jcq+vjnEQ=; b=K4sgpZAaPhUpp3ldNP4IW1o0Mz9sxmrYtKp4ATBPj3sOmagJtubvnZyNw5bMer8SE4 fogj2og2qD94iUh8WWuUSt0UOTkHKepRkgSzV/ChHvV/zdFRbLHBySIqW/3+kkcvwxyx NnKSTcjh6jD73XSS0FkdnJgIxiWTgtH48GqICYD7PZDdG6mLu7LMfVsoToKG4+5r5Y6z t2iJ2ToLTcrfVLWyl3BGU8etvToi7MSoQiYnrA31SGZnHwpot2lccdtfkbmATbuus3ik Gmnf7TMqFBxWg5Nk5Lrair2fZiheujFpx8MyxcTwISTMAWQFvMAolCCSEM7ROcha/pUd NnZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2ZAG78zEuHmt5lSV68vPf9nLmj+AlZTX60jcq+vjnEQ=; b=egrzbJ8v6ijXQVVS1+cyTwfP3gt3l7i2ZmnhpdkFwjkOBCjvzus2ax/8dszXHc7s67 orh1vTH0NcROqXJ66c/hQqLwBhv3ZNAP6DynFVQj2Emzem5awqJrjZEHO3Z1u/dIjkkp VazuhoGMqUkFZBNm95iAIlHJhfv7eA52qLQFdNetxTA1+bI1XAdqHKJbTPz066QqpdAP XAS4sU2D/zgp+ZgRDFnikKAKFK4Bzx5uIQ3lYoFHB5a7vFfsTE/TigDYk8VViKp8wvdn UGPDT7XmYLa/D48s0Hp2Jv+u8ya6O/Q9HUk80yPIWJIIrVhMOtj+BH83orNXnliGEdHe rDiw== X-Gm-Message-State: APjAAAXFQeIEpH2y89JfK8bIHOdUedhh2lP5xt1B9QmNLvw2nFBpU0Bu m1sprjvvNvfnyNQ27gPcQQRgeNoB2CU= X-Google-Smtp-Source: APXvYqwB8nptZiiMlPLXexXkSOWFAteFLIVhe+qXzOqSr8H26vzxsXUt6ScuwIshW7TY78Vlgkz0mg== X-Received: by 2002:a17:90a:eace:: with SMTP id ev14mr810479pjb.57.1571846125292; Wed, 23 Oct 2019 08:55:25 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id x139sm27225107pgx.92.2019.10.23.08.55.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 08:55:24 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Oct 2019 23:55:16 +0800 Message-Id: <20191023155517.335-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191023155517.335-1-lance.lmwang@gmail.com> References: <20191009013707.31249-1-lance.lmwang@gmail.com> <20191023155517.335-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/3] avformat/hlsenc: free the original malloc pointer to avoid error when system function used in the following patch 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/hlsenc.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index af4b532..7aefa28 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -493,8 +493,11 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, int ret = 0, path_size, sub_path_size; int segment_cnt = 0; char *dirname = NULL, *sub_path; + char *dirname_r = NULL; + char *dirname_repl = NULL; char *path = NULL; char *vtt_dirname = NULL; + char *vtt_dirname_r = NULL; AVDictionary *options = NULL; AVIOContext *out = NULL; const char *proto = NULL; @@ -523,28 +526,27 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, } if (segment && !hls->use_localtime_mkdir) { - char *dirname_r = hls->segment_filename ? av_strdup(hls->segment_filename): av_strdup(vs->avf->url); + dirname_r = hls->segment_filename ? av_strdup(hls->segment_filename): av_strdup(vs->avf->url); dirname = (char*)av_dirname(dirname_r); } /* if %v is present in the file's directory * all segment belongs to the same variant, so do it only once before the loop*/ if (dirname && av_stristr(dirname, "%v")) { - char * r_dirname = dirname; + char * dirname_repl = dirname; if (!vs->varname) { - if (replace_int_data_in_filename(&r_dirname, dirname, 'v', segment->var_stream_idx) < 1) { + if (replace_int_data_in_filename(&dirname_repl, dirname, 'v', segment->var_stream_idx) < 1) { ret = AVERROR(EINVAL); goto fail; } } else { - if (replace_str_data_in_filename(&r_dirname, dirname, 'v', vs->varname) < 1) { + if (replace_str_data_in_filename(&dirname_repl, dirname, 'v', vs->varname) < 1) { ret = AVERROR(EINVAL); goto fail; } } - av_freep(&dirname); - dirname = r_dirname; + dirname = dirname_repl; } while (segment) { @@ -578,7 +580,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, } if ((segment->sub_filename[0] != '\0')) { - char *vtt_dirname_r = av_strdup(vs->vtt_avf->url); + vtt_dirname_r = av_strdup(vs->vtt_avf->url); vtt_dirname = (char*)av_dirname(vtt_dirname_r); sub_path_size = strlen(segment->sub_filename) + 1 + strlen(vtt_dirname) + 1; sub_path = av_malloc(sub_path_size); @@ -589,7 +591,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, snprintf(sub_path, sub_path_size, "%s%c%s", vtt_dirname, SEPARATOR, segment->sub_filename); - av_freep(&vtt_dirname); + av_freep(&vtt_dirname_r); if (hls->method || (proto && !av_strcasecmp(proto, "http"))) { av_dict_set(&options, "method", "DELETE", 0); @@ -614,8 +616,9 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, fail: av_freep(&path); - av_freep(&dirname); - av_freep(&vtt_dirname); + av_freep(&dirname_r); + av_freep(&dirname_repl); + av_freep(&vtt_dirname_r); return ret; }