From patchwork Wed Oct 9 08:28:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15595 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 A6DEA44AA64 for ; Wed, 9 Oct 2019 11:28:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7DED3688144; Wed, 9 Oct 2019 11:28:42 +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 0365B6880FE for ; Wed, 9 Oct 2019 11:28:35 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id i76so952154pgc.0 for ; Wed, 09 Oct 2019 01:28:35 -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; bh=VF1uBan9/vBFUTfqCIuR6P5UfN0dp/isSYBd+CtBSd0=; b=uK4Jn9WaMrpd/4pXm7l63TGG3a5DKB1Kv+SxG/NuxrbX/XPmYypEt6du6iD7/IYJxg JZKjYRkHazBiDNqxMkYM8NzqWN9euysC4Pcsl0C3U+AL7OAw+00JEoJ/FMtLyrDN1/8C vxs/gCjh4nmqBBWfiTdW9+i5W/y6k37QxwXioMMUv2hEercKDwmcfOB63l6DbE+EVtb8 dOlhpoBTPbWsUxQHMXEt/nn/6rR8QfcC21NZb+VHqBH3KCFD/g5pj53wcBu5huZf7zl0 WALoMbOuDLy+Wbo5dLjuNujpU28xY4h6Mrd7MMKcQV47U0FjEvZUl5ZyLTBQZz7DSx89 YwBA== 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; bh=VF1uBan9/vBFUTfqCIuR6P5UfN0dp/isSYBd+CtBSd0=; b=omjbL8tJWJE1RakaXtd5rcqfd48o+qmo8g+OgngN7+pap6g83lHy7HpvIL70hjzsDD LZCI4Ih8xBkqjmk+S03bKLMC2unigeBDL09Tf58/6/infZCkkRXIGfW7vwMSUlIkOdk5 8L02EfX5uaJ25r2y4pyCQKT9WrBibufEsELmUyGc/YMO7m8Drt69gjsgbDbOFhbMwEyv GSQnKbPhJ+JLhr4tfqyhIxes4F+kYxxdlLgKpC2Tfk3IAUf7GiIYSjCR3uYCBQyK69DQ nBmr+40qtmB0oBhrxTV+1yQD1sqlnIImBVRmvgIkPitHUXMSY92+Shue4GQCAUlTqju2 fbsA== X-Gm-Message-State: APjAAAXjznkQttJQw6GfgBV9olBE8bb260yXZeCbaCJpQcoBwhcHRTAT kdsxftGqmc0OUMsbp2XX27enfXF4 X-Google-Smtp-Source: APXvYqweF00vTLRzGlC/8PT1QkpGbvQK2pmq8KkYRk5FSxzL8Zln4X0FN5Y83UkEnscF5+NbqEWG2w== X-Received: by 2002:a63:8dc2:: with SMTP id z185mr3029573pgd.228.1570609713667; Wed, 09 Oct 2019 01:28:33 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id q76sm2977483pfc.86.2019.10.09.01.28.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Oct 2019 01:28:33 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Oct 2019 16:28:25 +0800 Message-Id: <20191009082826.31858-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1 1/2] 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 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index b9f5b69fcf..5d8c4a3a8f 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 *r_dirname = NULL; char *path = NULL; char *vtt_dirname = NULL; + char *vtt_dirname_r = NULL; AVDictionary *options = NULL; AVIOContext *out = NULL; const char *proto = NULL; @@ -523,7 +526,7 @@ 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); } @@ -543,7 +546,6 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, } } - av_freep(&dirname); dirname = r_dirname; } @@ -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); @@ -612,8 +614,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(&r_dirname); + av_freep(&vtt_dirname_r); return ret; }