From patchwork Fri Apr 15 08:07:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35323 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp158498pzh; Fri, 15 Apr 2022 01:08:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytoiEHr55lJbU9c+JndvnmIzBvbujRqaMzrxMiXVNEB2E4MGm6JAKclUQnjd62WzG5fAb6 X-Received: by 2002:a17:907:6d25:b0:6ef:5af5:f1d3 with SMTP id sa37-20020a1709076d2500b006ef5af5f1d3mr1158092ejc.315.1650010119830; Fri, 15 Apr 2022 01:08:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650010119; cv=none; d=google.com; s=arc-20160816; b=etAULZOQksO6HiGwS1oNHOff4z5KctZYdi1RoZ1AdtiL6PdhI/V6P14qJ4FU2xI3xN BcdN2E+ZDu/2UZ86kITXfrdRYdZHDgJlP/HKcHK3Q9s63DIjn7nA9TWIYAJ8VEgoXwNr b6/ua726Y0PU0v9Fk7Wi//z7gUthlFcwElt8E2KzS0/G0FqQ9MLjcsq9+bqNMFtPOPoX FuicpsbZHS527LViMuuVAgWtD2S5uVJv+bo1XmRbJ/p7thYZCMhMagNj89T/PVTeXvog elQ1c+vAbcB58yBKGngnRLkRqkIDVUVouRWmOYfkUzrTEB7kW6UqT5Ts05SKxgmxknM2 I6JQ== 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=Pl0PLxUStBiZGAoVIeSQETXGuoV8tZb9V3Zrnf4nwP4=; b=e/pyGYHbFz3fjJduF1RFhAOzvYTgzwDhgxvDkarUZKwZi5LdWGK0IGEyAqMR+7o+bi MRy/18Qk5X0WpubaABPgOFQCDtXlgWbR3lDjnC17jzn02ilpdsiPDm1M0wddGtcC/EZE 2h94ZIr0JA6wFjn+OgRSEjRJpueZyJY6P65jte1KY5cGZrACld5qWtKko8TqNr34Gwoe u/fHfWvNHHEz9W0GEXBYgExvbSwsj8vOF/Dep1ragLcMJmNY6dxGJG02raWwmkgKcST7 sVk1BMNQSNKwXA+rRQ+juvNc2cTGcTCyTnoxKuxdXIZTt6uBMp6oyB3APHLnGnuQMcpf cLGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=InQwufyy; 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 r19-20020a170906c29300b006e89d0c88d9si539190ejz.633.2022.04.15.01.08.39; Fri, 15 Apr 2022 01:08:39 -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=InQwufyy; 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 0DDCA68B3FB; Fri, 15 Apr 2022 11:08:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from msg-4.mailo.com (ip-15.mailobj.net [213.182.54.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C86B68B3D6 for ; Fri, 15 Apr 2022 11:08:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1650010088; bh=c6I6DJoJEcHze4lKJk/RqaRg3MXYs7DyvuFduRUa2Fo=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=InQwufyycbmqMXx8rqaF71S/aKxSlRsYhp63+3fLQJxcpcUpUBtbiLkhw8YGuRwRO llajvhJevbbH4v1a9y0dAnJKdkB0T82ctXoqZUdcgzNobpBPOYjfnHuioTlCrWYXNX pKLF48/UgSyy8YGUc4BftMvwWL2aYfxN136ad8uY= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 15 Apr 2022 10:08:08 +0200 (CEST) X-EA-Auth: hcF8apReMZfdoKPRhZE61kIs/VXxrknDO4jlhbPyPb+FAC0zK+oD7IdLJNhb4E09jwsN20RHt0GCx9dPNgBfV7A3jnlFCpbMmjIYS4X+8l8= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Apr 2022 11:07:44 +0300 Message-Id: <20220415080748.18517-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220415080748.18517-1-nil-admirari@mailo.com> References: <20220415080748.18517-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 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: v+6ocqfLOgmE --- libavformat/avisynth.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 8ba2bdea..f7bea8c3 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