From patchwork Mon Mar 28 20:43:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35028 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp524729pzb; Mon, 28 Mar 2022 13:44:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxL1dZMBZ3ki/6y4Lf9IRHTJphb52kRSjwOHU3SoQiShZA0NzdNnKNSzP1FNASQaUg+Xbth X-Received: by 2002:a17:906:2695:b0:6ce:f9c:b476 with SMTP id t21-20020a170906269500b006ce0f9cb476mr29844280ejc.235.1648500262024; Mon, 28 Mar 2022 13:44:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648500262; cv=none; d=google.com; s=arc-20160816; b=ha1VXxYa9BjemXvAZKgg6uVYPof524QXZarJh/Dkoa4rc2wMm028ULGJD+Ddt65mq4 N4moPQZQqoqbZq4kyMxWZOTOHMkVJ4d+11Sigy5z847kuo1Efn9njkcL4Q+pAvAQJtQf P5T4eoyXG+JBHTN6FN74o42r1rSFp0yyj4WLB+OWcYNUK0alECXKAxEQqpNNv2e/RjKz nPP2pvJlVoZIHgZTPSrX//pCUWjV3/RdQLsgCGgvqcidxO/Sdq7av0DnK8L7qeJBQygK An3+ZlQCoN+lVjKRoFenSI9PZLyHzIKw6EsXQFrF+X/cjyH1yoWsnQHen5U5mIAkFQQ8 uVNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=dwSvjxioO0doBCpr5Y8SMtOEgqjUaTS+q4nliwQeTEs=; b=Vz5HuG+3h+z79FXIYgxWa4rMGz9p9dD4wqu8tM5IATPoRKcKOgvIh5gCA5/huVFcCM Ssg9b/CEON877Ex49puPqt9xm7EucssOIHsrdhbwP8dT6JiHijCG9cXTJFOabgl8dC34 vnKkz12q6hpx14EEciiC7TORdCWQpN1bLlGDIRHNZx04zvxQKrS2ktl/8L5SjmkCDZ5O J9URFpZnaQM6hnY30A52TLk45Z+rNQkOHpodksT/lxeJuo1u2SIKSBU1FjX8Cml06elJ xdRF7IZ3Bci1i69GCpqtnXq3A7gkMq5gxcz2z7F/qUHSy2EOvNaJNVJO9kMZTMnHyTF7 /y0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=caIEc3Nq; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k3-20020a50ce43000000b00418c2b5bdcesi13477342edj.176.2022.03.28.13.44.21; Mon, 28 Mar 2022 13:44:22 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=caIEc3Nq; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D174D68B2AA; Mon, 28 Mar 2022 23:44:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-1.mailo.com (msg-1.mailo.com [213.182.54.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D63168A2F6 for ; Mon, 28 Mar 2022 23:44:01 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1648500233; bh=dvLYrNoesfk2V8b5osf69PObyaxehTI3NBtoo10AI4Y=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=caIEc3NqBb5fc/JMwrE8JSJBEccwYsx4YiaBEnTZVox4RZJXvaQAqTBqeqeADm4rZ pxfd0TeTWzruI78eZUeKu76rn5Hhgdq4pG8mP+oYrQv6mYOQkSeefgwzC1GuqxOPfl TbnlfQEE5hUujuxnBoG5ghrr3PuEuKpF7T6HF8Hk= Received: by b-6.in.mailobj.net [192.168.90.16] with ESMTP via ip-206.mailobj.net [213.182.55.206] Mon, 28 Mar 2022 22:43:53 +0200 (CEST) X-EA-Auth: 5TLBe3707H+7bojCnmajPbt1Vk9kvug5LPrqSKQsP5SVaqI0qNDePjgU8QG+N1/cocMg2emF0ndK5CPCGw9Sfi7blIA2rMJbWI3KGuH3l0E= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 23:43:35 +0300 Message-Id: <20220328204339.13009-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220328204339.13009-1-nil-admirari@mailo.com> References: <20220328204339.13009-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 2/6] libavformat/avisynth.c: Remove MAX_PATH limit X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yqcDOzbE+dY1 --- libavformat/avisynth.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 8ba2bde..f7bea8c 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -34,6 +34,7 @@ /* Platform-specific directives. */ #ifdef _WIN32 #include "compat/w32dlfcn.h" + #include "libavutil/wchar_filename.h" #undef EXTERN_C #define AVISYNTH_LIB "avisynth" #else @@ -810,8 +811,7 @@ static int avisynth_open_file(AVFormatContext *s) AVS_Value arg, val; int ret; #ifdef _WIN32 - char filename_ansi[MAX_PATH * 4]; - wchar_t filename_wc[MAX_PATH * 4]; + char *filename_ansi = NULL; #endif if (ret = avisynth_context_create(s)) @@ -819,10 +819,12 @@ static int avisynth_open_file(AVFormatContext *s) #ifdef _WIN32 /* Convert UTF-8 to ANSI code page */ - MultiByteToWideChar(CP_UTF8, 0, s->url, -1, filename_wc, MAX_PATH * 4); - WideCharToMultiByte(CP_THREAD_ACP, 0, filename_wc, -1, filename_ansi, - MAX_PATH * 4, NULL, NULL); + if (utf8toansi(s->url, &filename_ansi)) { + ret = AVERROR_UNKNOWN; + goto fail; + } arg = avs_new_value_string(filename_ansi); + av_free(filename_ansi); #else arg = avs_new_value_string(s->url); #endif