From patchwork Wed Oct 9 01:37:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15584 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 9D6CA444705 for ; Wed, 9 Oct 2019 04:37:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 716DA687FEE; Wed, 9 Oct 2019 04:37:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7DBE680373 for ; Wed, 9 Oct 2019 04:37:15 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id q7so508770pfh.8 for ; Tue, 08 Oct 2019 18:37:15 -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=/2Hb0AVWhjzYTQA4cu99CDMdthkPqSB6jp7Q/eqhfbg=; b=XplgjpIdrwle0ZByWCuKtn/x7qge9jVHVAcRFfqNCYmmfKJKvaL+tZ163nwbKhub5A GhSWKfd3EBedJuk2vHvvAa3aNCSPa3Q84uDPFqsNPmehfunzVfm0Iciagqs++WgSi+Rb N0rMy3OyRehClTv3qnPQsqLTWzyFUA7FBqHe5XETMVHPSxCealrssZvD1jYkPXG0jVfa MzO9ZKaUO8CciofLH9/nCyADBxRt+qM/cHcWm5qTNQyHKEx8NmWFwRYZhROygY1OBTpA mgltMpx6y1zIh20zMJrrUrJQleYrnW9+wu4eY2ueYINMfB7gQ5Jz++yxv0WMIoAKXuGe EcGg== 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=/2Hb0AVWhjzYTQA4cu99CDMdthkPqSB6jp7Q/eqhfbg=; b=aVleiaaZhY4IORk0UFczfQHWTB/MGlmZIbOhDHNxuc644QUYk5krBEBMfgJKsQZnOI 81x/2VIMpd1HxvuEGsfzS5Z5jAyq4DDDnCnVY9woYdbUoWzaBXXptBQg54tISTvK6coX QfGC59GyFVi8nyxFCWln1UnM9wOo0yUXEZMa9Zw9lIuZYr640DIOn50xOZDAJ8tPXs6p 1y3aMG9RFNY2bw4xVJ86VQ7Whq7qwljqE0rAKu2Ocvh96HY4qv/ITGrYEA7rPmQFD1Ut R2qi9Bh00D2GG5s29ujr1iWGd0cxDZljjXo717F8rjvbAKss8di6OMfECTztSg5VsNL0 OvIw== X-Gm-Message-State: APjAAAW8cZp1q0yc1KU1D/78oYbKYUapiYB3zAh51b9cS7gNRt2wj1BV hPlijeBci7vt7N40d2CdSoEOTwKo X-Google-Smtp-Source: APXvYqzmckxiIrwpykn27GCjNaddBO4SjYeBLd4r3OZqAmLffAeBQyT0rfKTIQLBN8eXcm8M9kW4Nw== X-Received: by 2002:a63:383:: with SMTP id 125mr1584172pgd.41.1570585033270; Tue, 08 Oct 2019 18:37:13 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 127sm332221pfy.56.2019.10.08.18.37.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Oct 2019 18:37:12 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Oct 2019 09:37:07 +0800 Message-Id: <20191009013707.31249-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191008143114.29043-1-lance.lmwang@gmail.com> References: <20191008143114.29043-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avformat/hlsenc: fix the av_dirname path isn't include separator in the end of string 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 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index cd4320114d..74f5e08729 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -478,6 +478,12 @@ static void reflush_dynbuf(VariantStream *vs, int *range_length) avio_write(vs->out, vs->temp_buffer, *range_length);; } +#if HAVE_DOS_PATHS +#define SEPARATOR '\\' +#else +#define SEPARATOR '/' +#endif + static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, VariantStream *vs) { @@ -544,7 +550,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, while (segment) { av_log(hls, AV_LOG_DEBUG, "deleting old segment %s\n", segment->filename); - path_size = (hls->use_localtime_mkdir ? 0 : strlen(dirname)) + strlen(segment->filename) + 1; + path_size = (hls->use_localtime_mkdir ? 0 : strlen(dirname)+1) + strlen(segment->filename) + 1; path = av_malloc(path_size); if (!path) { ret = AVERROR(ENOMEM); @@ -554,8 +560,7 @@ static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls, if (hls->use_localtime_mkdir) av_strlcpy(path, segment->filename, path_size); else { // segment->filename contains basename only - av_strlcpy(path, dirname, path_size); - av_strlcat(path, segment->filename, path_size); + snprintf(path, path_size, "%s%c%s", dirname, SEPARATOR, segment->filename); } proto = avio_find_protocol_name(s->url); @@ -575,15 +580,14 @@ 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 = (char*)av_dirname(vtt_dirname_r); - sub_path_size = strlen(segment->sub_filename) + 1 + strlen(vtt_dirname); + sub_path_size = strlen(segment->sub_filename) + 1 + strlen(vtt_dirname) + 1; sub_path = av_malloc(sub_path_size); if (!sub_path) { ret = AVERROR(ENOMEM); goto fail; } - av_strlcpy(sub_path, vtt_dirname, sub_path_size); - av_strlcat(sub_path, segment->sub_filename, sub_path_size); + snprintf(sub_path, sub_path_size, "%s%c%s", vtt_dirname, SEPARATOR, segment->sub_filename); if (hls->method || (proto && !av_strcasecmp(proto, "http"))) { av_dict_set(&options, "method", "DELETE", 0);