From patchwork Wed Feb 16 15:08:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34342 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp1304359nkf; Wed, 16 Feb 2022 07:10:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJwT938HAmm5uZ2ngftC1Awyg7UOEBgAzo2EwK5XmQAUOz3m100PyqjlxwWcqnQX5rhD28XU X-Received: by 2002:a05:6402:d0d:b0:410:8411:216 with SMTP id eb13-20020a0564020d0d00b0041084110216mr3407563edb.316.1645024212033; Wed, 16 Feb 2022 07:10:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645024212; cv=none; d=google.com; s=arc-20160816; b=m1RrQ4uWCWTWukXz4b2Am6S4ejj8pIPk2sRfbpSolL+wkAdHLqePgS24aZLAc23MPS a+Dh6OIh63iLgHhGfFy8Y2qh2xcZLkdqzVp6lSTMKNeBEKeXKoVJggbzXeeCoPfmBNCk YO6flLP2++3woYPbTQeiHgKAIMz8MU9NVWgHB2O+Ra7PGrRfGa18ZB6GQ1R8vRAVo0W7 zgbUFlOHiQcTDNvYAVKTpANyKKuSozRR0QPaqscq+CeuSAcQNG9g7spAMLNeQPwOlxI+ YmTzBPel8PQXSrtRokhgc9Cqvpnhb8Fp1L7XKcXDIjvmc/Nna0K22Ux5/A+8dZDYUKAX oMxg== 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=hCVbt+lzr4OAhA3TV9+Jn55D7w0xjewMlwp0jEIwql4=; b=FZlDv1BILIwuUak4g46s11HKM6ltHh4sG4Ai/dQothkjpGljAOPI16EEOrwsyg3MVM mjY7saBkw9wJRttl+eKk5iFM2GCPZgw2SNMBJjzJc8XqiUdd+vMcA0iXb4M7bBuqKYQh V6ZDE6H15eHm6grTtXb28voQ4mTrITCS9m+zIVqIKcQASe/gSfsQUyDhCS0TDi5veuN/ uIVrNTq24r2sDLVsTYdBRkTD1MpYwAOMakM5hsZsg18uFXurAANSrSxCmwH8twwzgk5z 7L6VtBG6ZQQhJ81rEJjxz66j2tdnLXgOXQO4q+Bqdn+ZRG2rf4N9vWcSkPyb45tsy9La Ap1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b="UF09/B0f"; 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 kx3si10122ejc.130.2022.02.16.07.10.11; Wed, 16 Feb 2022 07:10:12 -0800 (PST) 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="UF09/B0f"; 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 14A7068B2CE; Wed, 16 Feb 2022 17:09:25 +0200 (EET) 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 B645B68B20B for ; Wed, 16 Feb 2022 17:09:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645024150; bh=IIZWG4Ae6e2j6qda26O/yamptBIE8ZqN2zc7+FhoQ0I=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=UF09/B0f7qVYyZ5jAIY3FnkilUiiw+iD/YqwmsqEwV8E6HIZ8TiGRPv72GpSu4fQn j3szbu6MKUkjM8QN2Nmwm/tLwpNCYtE3KhQWKDcpJYLIPjHsHduGBSXrBU2IghhYGQ gBN0LhImsbtl8hNDEkhcizlSHm1DgxGsJ0Jp6nas= Received: by b-1.in.mailobj.net [192.168.90.11] with ESMTP via ip-206.mailobj.net [213.182.55.206] Wed, 16 Feb 2022 16:09:10 +0100 (CET) X-EA-Auth: qmwptvSCW9HEt+jCC3SbYME0BC+vHmoh+6lem8pbvUFR2sI/pkKcoLAnRvOafjdD1z8lgMvfdzMK1p1bRtjXx2dC13HJwlgzajmAY+kfsxg= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Feb 2022 18:08:56 +0300 Message-Id: <20220216150859.16844-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220216150859.16844-1-nil-admirari@mailo.com> References: <20220216150859.16844-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/5] libavformat/avisynth.c: Replace MAX_PATH-sized buffers with dynamically sized ones 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: OKHdl7gHX/Gh --- libavformat/avisynth.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 8bc3986..219f307 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -36,6 +36,7 @@ /* Platform-specific directives. */ #ifdef _WIN32 #include "compat/w32dlfcn.h" + #include "libavutil/wchar_filename.h" #undef EXTERN_C #define AVISYNTH_LIB "avisynth" #else @@ -806,8 +807,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)) @@ -815,10 +815,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