From patchwork Thu Jun 9 19:04:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36095 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp542389pzj; Thu, 9 Jun 2022 12:04:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzP30NZN+2GWfPTp07GYDCyUySKS8BKVp8CDVD+mng8qg6mBmd/fo0kC5t1GCTT80AtRibc X-Received: by 2002:a17:906:7a5e:b0:6fe:d93d:21a3 with SMTP id i30-20020a1709067a5e00b006fed93d21a3mr4164486ejo.596.1654801483873; Thu, 09 Jun 2022 12:04:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654801483; cv=none; d=google.com; s=arc-20160816; b=e8LUP4n0A08ZK6770y4ebJDJnhLlhMK8PLsCyekoAtvi1uaQTwrduZvU5TLOPLgngA b5VgZzcc0lGjd1K8t13tePB915Lmr6CZp09UUwr+nau3edJ5LgfR8QT+6aADYHrMeZ1X EjE+c9PLkcLfEQO6gT1ZgasfaMoCpHX2YnwxeD66Ar+Htz60kwRQK49Md2D29lF5kyyc DLgMQKvNp76jvRr50ekj8nzWS3c2IxQaPGwHisGL2weAxpqzmvZ7xWD1MO9HYPBZsFiY QKKaIiIIoAnyxowYZjHu6yEznXgqYYz55C/cwpZrKFW4bWo00XYEvFwawHwPV6+C+YbI K5+A== 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=aYmxMYrs3hJCZadOTVhZJFh48qqDpc5LXl/qTcjn3VA=; b=zvDxbZPr2oqqQA4P19tW8kS6xMyu+X70cqcB/qNptI4VdC5ivTYWffiWjcT5TUBWB1 Lah22uzHgfbx04Row9peeMOkVGfDIh/lnC0C2o2P+G6rVivC4laOThAsFQqrhUdDGdVt 79jb9Lv0VYVcYfsiYuu5CvyEvhukuS1arBUi8Js9YL4nX+NlnfenG/0JlK2aqTUeB7Ow VvNNkuwb+xTa6exKqY1sjSAqy9HWubTAohNYfPKcENN2XbC8zktmu7DE5sOyR/8aZkWD wF4XedGJsnO8crX3k9dpVfqkbwBjfStAbiBNTJJFN4QC2iRbPYak8A30adEOa3s+pE4r ttgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=nr9xy4dt; 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 qw29-20020a1709066a1d00b0071114e6de39si4420717ejc.679.2022.06.09.12.04.41; Thu, 09 Jun 2022 12:04:43 -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=nr9xy4dt; 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 5970668B7A2; Thu, 9 Jun 2022 22:04:24 +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 05B6568B759 for ; Thu, 9 Jun 2022 22:04:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1654801453; bh=mpaN5hOKH8Aw9kq9HUTODy73YmSm0a0YmTPV45fwKD0=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=nr9xy4dtLORASy7VundNA/sm6fiMpXc8Od2zBIQXENwxhk5BbnsFGSTI4n7wH8AvS WpGELjm8knw1uoiBecY4iBhRjEMP9+6Ud9C2lr7nEr8zQ9VoVaouA74g4b4ir9XNS+ LlYcbYwOuW6k0crhRLnPIfCaLatW9vyJ2wmzrRRU= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Thu, 9 Jun 2022 21:04:13 +0200 (CEST) X-EA-Auth: blORkXPIBqbSOElMdWa8dNcAwbkRmgNPJ+dprqOlgY+ZdoaO75981Zuf3pmXDHPwuVrW6SBRgh4S/RLZCYgAqM+rpKFdVFBCfYQ1mABRjdU= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jun 2022 22:04:04 +0300 Message-Id: <20220609190406.6339-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220609190406.6339-1-nil-admirari@mailo.com> References: <20220609190406.6339-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v13 2/4] 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: t1+v+6fK0wuN --- 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