From patchwork Wed Apr 8 01:34:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18773 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 956F644ADC3 for ; Wed, 8 Apr 2020 04:42:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D74F68B6FE; Wed, 8 Apr 2020 04:42:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 733B768B6F5 for ; Wed, 8 Apr 2020 04:42:05 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id a24so1657638pfc.8 for ; Tue, 07 Apr 2020 18:42:05 -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=IPgXRPMyiwDSolOAF+Ak0Ay/VcK5vXhQjumxv9F3Bz4=; b=LU31tynZuiaIKdbeV7qSLQyWmEeeYPhiVmz2oiUQ3y2dePL+amQ/OvWgQaKtoXTJQU iUXJFPrhb4YjAkz4ANnPmCRa0uPBchdUwuTj6fzH3/5keS9Eh5ZPCD2ePpTcAz1WZ29n PyQ1UQOg64N6k1gx1ukRn8iYZbu92mJ77toQIWmXSFxPQ3RTV1MNXls2XDJgCdhwjRCP RFSrvFVOEMho2mZ49f4kkwfKWTYgoSW3Y20wuAZkxCL7l+5eZKl/BiwqnRdxTQB8wI25 /E/ylMuyRj/KNFxWF2IeX7gN9J7vHc7rk2kp61yIAG6HLsSMxZg0ebs7nNxWg8CzUdvJ 6A4Q== 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=IPgXRPMyiwDSolOAF+Ak0Ay/VcK5vXhQjumxv9F3Bz4=; b=rTdpi7A8yUuXWr7pLqKWlBvcIXZvuXeR/v7Myd9M2MREgCgOW1qPnYGwORtpCeFwpN Fsx7ZDfcmvjK4lK562o8jcvR4qhHx0cU9uyph/3mfWeTlRpVtw+kSXWfwg4iRw7F9HIs jwMLtEHBJheUTX02gmEUM2KEfI3mLcSCyN8JGWMQD19rzGtXaO7P2HE5A03InewshCpr REyG5cF+/r+YUWmn4cUwi+URIaWVDi4KyrV8u5LeDrFdUphtYHTqT09M6vyoAMClfgwE SP1uOEzskw85/PXlE3BxP3ti6jzwLUkLfZtGB0NNERmHvH/XxF5i3nFt4/ixCRN06wm0 StGw== X-Gm-Message-State: AGi0PuamN1R0sI3c8VhMJXzXNXb6nKYKhZpML1yBuE9pPN9U+2dDuQCh dAqJoZ+tfo8Ha/J9T7aP3TEPUIdE X-Google-Smtp-Source: APiQypIlczI62th8eXvtbpZonWciLgr/+JqMt+jMcpXSmHO/E3CGBw1pjrJgDS5kX1fuj1yYhJQoEw== X-Received: by 2002:a62:1b05:: with SMTP id b5mr5289940pfb.281.1586309762803; Tue, 07 Apr 2020 18:36:02 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id g25sm7519554pfh.55.2020.04.07.18.36.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 18:36:02 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Apr 2020 09:34:28 +0800 Message-Id: <20200408013428.19494-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 v3] 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 | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 94d463972a..903fdd0aa6 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1832,28 +1832,20 @@ 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); - } + 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); + 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); + dashenc_delete_file(s, buf.str); + av_bprint_finalize(&buf, NULL); return 0; }