From patchwork Tue Apr 7 23:16:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18770 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 DD0F144AE47 for ; Wed, 8 Apr 2020 02:42:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B296B68B6F1; Wed, 8 Apr 2020 02:42:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6203468B695 for ; Wed, 8 Apr 2020 02:42:03 +0300 (EEST) Received: by mail-il1-f195.google.com with SMTP id g15so4987883ilj.10 for ; Tue, 07 Apr 2020 16:42:03 -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=+vNy0fAuJ8pUrzDlnBgc1JMaKH1L37ei5MPsjdZjxu4=; b=T5eZvUvvWzDbn9QYI034rkdwwxxtL7n9dHond4vRGkUcpLox2mXDG0K/qeMix5Wbwb 4qBhfoixKMo4zYvt/RB0Dm+Q+JguTWX56q/xdC+/PB4j/b6iG7/EEHeo8Ice5sdGxVYz 4aUFXCfFY7/KaYy/8wmH7/Aclb/SKLErNHqr7K6UPOZRbMT73kXrSN5JQkdLkmp2jssq 9obtgNp9HfaVKO8A2Q/PzoWIlVri1Rf8ydMesHPV32hVH7Yqn78Qq/+L/iBAk6ELlvY6 YN+/dlw9zeHoLHF6GmwvBAdAgFBEpeA0zC3/e4V3SxRk4gnx3nACsWmtQVf81Qq5qNmV u4vg== 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=+vNy0fAuJ8pUrzDlnBgc1JMaKH1L37ei5MPsjdZjxu4=; b=K5DOZII3wxsCLcI8HI7cnSqAq7AqxzAVwl6I8+COaeEtwj8dfkZRNeGzNuyJg/b5xy Aur1rfLp21Upm5nwCDz1nr1Ou1ry6OYddPzWkD2V2SobxRapVlcko1oFCECzwKWrVUSL E2eBaadz3iybv857kJi3vZJObGrbjZVRIoPzzaoDwTsAfTlhZVXXtNhI7Cdp909PVKT2 3MUi8xkbUhm+lQj+FUa0/eOD35Apax7C/kbjG8eA4ode3JDBVb4iu6GHzIL9pqOsXtpq priwuDitOa7B5IHbTY+W9qCoqkITNHHsaLnZRu2nTsEPeQr3ylrUmcQ2T94ChXxuE71A EIRA== X-Gm-Message-State: AGi0Pub4qLfYBIBBjQiyyBB/8QiYpIXOV1mpY5rjmOh9dEzA1P0KxhSi Vm4NgoJjAwtAFMMCPFtZnx7UKz/3 X-Google-Smtp-Source: APiQypLK3Xg4fI9rrS27wMpxoA2hcxqPiAz4tXTtpnX2FvENPOJI2oqlaQiKEWgbucZ37bF2MD1REQ== X-Received: by 2002:a63:6246:: with SMTP id w67mr4429780pgb.212.1586301381531; Tue, 07 Apr 2020 16:16:21 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id g2sm15076327pfh.193.2020.04.07.16.16.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 16:16:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Apr 2020 07:16:16 +0800 Message-Id: <20200407231616.17581-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200407153039.13162-1-lance.lmwang@gmail.com> References: <20200407153039.13162-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avformat/dashenc: remove the arbitrary restrictions for 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: 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/dashenc.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 94d4639..f80f6f2 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1832,28 +1832,24 @@ static void dashenc_delete_file(AVFormatContext *s, char *filename) { static int dashenc_delete_segment_file(AVFormatContext *s, const char* file) { DASHContext *c = s->priv_data; - size_t dirname_len, file_len; - char filename[1024]; - - dirname_len = strlen(c->dirname); - if (dirname_len >= sizeof(filename)) { - av_log(s, AV_LOG_WARNING, "Cannot delete segments as the directory path is too long: %"PRIu64" characters: %s\n", - (uint64_t)dirname_len, c->dirname); - return AVERROR(ENAMETOOLONG); - } + char *filename; + AVBPrint buf; - memcpy(filename, c->dirname, dirname_len); + av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); - file_len = strlen(file); - if ((dirname_len + file_len) >= sizeof(filename)) { - av_log(s, AV_LOG_WARNING, "Cannot delete segments as the path is too long: %"PRIu64" characters: %s%s\n", - (uint64_t)(dirname_len + file_len), c->dirname, file); - return AVERROR(ENAMETOOLONG); + av_bprintf(&buf, "%s%s", c->dirname, file); + if (!av_bprint_is_complete(&buf)) { + av_bprint_finalize(&buf, NULL); + return AVERROR(ENOMEM); + } + if (av_bprint_finalize(&buf, &filename) < 0) { + av_log(s, AV_LOG_WARNING, "Out of memory for filename\n"); + return AVERROR(ENOMEM); } - memcpy(filename + dirname_len, file, file_len + 1); // include the terminating zero dashenc_delete_file(s, filename); + av_freep(&filename); return 0; }