From patchwork Wed Oct 23 15:55:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15920 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 BC1634481F2 for ; Wed, 23 Oct 2019 18:55:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 940C968ADAA; Wed, 23 Oct 2019 18:55:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2436468A8A4 for ; Wed, 23 Oct 2019 18:55:25 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id p1so12402632pgi.4 for ; Wed, 23 Oct 2019 08:55:25 -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=Yy5BqY+WqDF0Wee3MySK+wqb2oEisnieYZUPu43brF4=; b=dtNwkU4jlXt7du3gmrl80dq4+aJnaHICQE7r66A/bQVvw3YIBLBSvJrtw+4u7yfo1t G37Dp6EzBgrahvqehVYKLPmricDKF6AUhTHfYmDinKIo7Sb+kDS91zPVtn/1ZzNF8+id /q7hsNj0vYTHK/oldp6vKXLfxluJXxAlDA74whl7PF3BPoqONoesz5ilksG4hkrGisTn A4mMMHI7xRmam4hTPXMKUxtHLLXCtLCCwS21FUB7nYROyqPVXWP26NtzhC/EcuOdK0gY xLZxgTtUMtX7qOPn4W1/vFW6ITBUGuCMIDTn+uZ6sciaKRJNtj82e+EcCJAl+3opqIkG Xo7g== 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=Yy5BqY+WqDF0Wee3MySK+wqb2oEisnieYZUPu43brF4=; b=QfZb4mQLLCl+JKUMqSTitZZ3bJlRg7smslW5WRXbCEhtMp7fh8DUj7ZAEk/bzE9+Om XWZY1Tx2dbdfYJ2rBLswNQZV4/JdmmGh4nRjeMz2wkQ/rXChClUXUdfI3yqdGpPaGKNa N6DpWkC7Hjos255eaiRX0ZGK6CMs//iV1PYG9SW45WXOEM3W9r06pwBrwEF/WvLHC4IB STP0wC3k+snVgmXRfqc+RnSCmetQqlON6Fx9LeF3jF59/ntA0MlXBd9Rv2RxexnvyicO +FDo7761Ub29O2l+6mzoQyL+xuIHH+jaUPvFTL8sEytJ0y3lrZH2Y6U0rro7AHUVVEgb JylQ== X-Gm-Message-State: APjAAAWfWcon0ZSgaI4QV3Bw9zwm050v2FAt4m+8hr0pwUi7kZfeB+Vx FHwu/158b9ynty8q+Z15CCE4k6Rq3O8= X-Google-Smtp-Source: APXvYqweFeF3wJiMnlnf7z6GIYciLmWAG7k8BWmvbj6aiR3DogkcxQg4yDnmej8auQMYG7sCMw/VGw== X-Received: by 2002:a17:90a:195d:: with SMTP id 29mr854659pjh.130.1571846122740; Wed, 23 Oct 2019 08:55:22 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id x139sm27225107pgx.92.2019.10.23.08.55.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 08:55:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Oct 2019 23:55:15 +0800 Message-Id: <20191023155517.335-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191009013707.31249-1-lance.lmwang@gmail.com> References: <20191009013707.31249-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 1/3] 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 Reviewed-by: Liu Steven 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 7b1d54e..af4b532 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); av_freep(&vtt_dirname);