From patchwork Sun Jun 5 11:35:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 36073 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp5652273pzj; Sun, 5 Jun 2022 04:36:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhmK4NFy4NCRPtyHTTF4YmRbCfjNllPnjEWmQ2RsU1cmTvh9ovcJFC/sYVT8wpjg7CK5Tg X-Received: by 2002:a17:906:4356:b0:711:cd0d:b205 with SMTP id z22-20020a170906435600b00711cd0db205mr978179ejm.240.1654428977858; Sun, 05 Jun 2022 04:36:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654428977; cv=none; d=google.com; s=arc-20160816; b=yYyJ131Yk/tVvgwASfzx/Y53R/JtChuCkR2SPM7pc7zfvRHBXPTIg8t8t3f7UqtiNx qpIDQ4Q6tLIQjXXk/wWqWEgx/xUeWC69VMDGa1cLvoEl3t+XO0Ese/W9QvfjhKbHpWtT 3EK+PZo6Dph59xbyDMTYd13R2i4WtSNJuEOnTQTdGcnHI9wGp/Ka7EgRl3ZNRDkkwi7w CtlpFwERfUrWmRVLS3Qa7hFsGKdtf1GWrmGA9dYjA8M0Fw+nYr33YHIX4jLa2lxtSPLK PL+cLQWR4YxcuSTlKEXUXNfEqc4ey95OE+FKgolR50Sz0ddvokfBY3CpOeFL28SUNU71 a0rw== 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=NfoqIpz6Mom/N56CvfZgD+XMQjG1Oi/2TnyNuQj268MmJz+BmFbIqHDdSFOBN3blCE qHsAbLEFr/X6WTgtPjPxYu615ZlcmFLfPw/C1p1+DppYgGlkeyT0iKTA94DBeKUZspZ3 0lXez/rcuIy0+CBVVmo88+oxbzVMlkucCoZjtLsmEoP9JBP4IpQBxi2w50lJVOEioXDV SUDiE7r8ud3paDklAuSB5uAA9FMiF/ikv4qewaromHB9eDr3dReoc6dUDnQlyyX7QD+c Zhb8aPScBsHdAIUFi2tg1RHxyw62x6jh1mZOaajiZch9+nK6uQ1p2BqmEW/KJgwQolXw 7Ukw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="kHzaa1//"; 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 z14-20020a056402274e00b0042df4f079c0si16767200edd.383.2022.06.05.04.36.16; Sun, 05 Jun 2022 04:36:17 -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="kHzaa1//"; 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 17CB368B646; Sun, 5 Jun 2022 14:36:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-6.mailo.com (ip-16.mailobj.net [213.182.54.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27B6268B527 for ; Sun, 5 Jun 2022 14:35:52 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1654428950; bh=mpaN5hOKH8Aw9kq9HUTODy73YmSm0a0YmTPV45fwKD0=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=kHzaa1//CiJLx+CneG09gdCYITlWWDEzyOHxWTo9oQ02z1cTd+W5TGQ83fuljkko+ 2nHJ5OLfIOEKTcW4tZ6lYTw98eIloI77YvOUYqU948nmC99lMQ+dYkqk/VKfmfF0LJ VyMjdNfZo/plTPW1MSg8Zu78cmLRWT2xBjzB4sHc= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sun, 5 Jun 2022 13:35:50 +0200 (CEST) X-EA-Auth: +40tETL3C4S2E47i3pjUTX2Lxi8TAvvXg8Rh+SG+wmiVuw7YiFWqrI7xjWBVso8ocVNKcm88ncw+0r8jAwrVXundMBK4wt2Z2K1MOawT4Vw= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jun 2022 14:35:40 +0300 Message-Id: <20220605113542.12280-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220605113542.12280-1-nil-admirari@mailo.com> References: <20220605113542.12280-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 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: 13cKJE9rPdU+ --- 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