From patchwork Fri Feb 18 19:11:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34392 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1213404nkx; Fri, 18 Feb 2022 11:12:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJz2Mo4SD5TdmMJE9lPdS5vfI4395Bp9j1u0DoeqSDAkVh27TRe2CUuynYmKjPjXnw319PCz X-Received: by 2002:a17:906:b28b:b0:6cc:734c:812d with SMTP id q11-20020a170906b28b00b006cc734c812dmr7486347ejz.657.1645211561677; Fri, 18 Feb 2022 11:12:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645211561; cv=none; d=google.com; s=arc-20160816; b=QcHDt+g28964VX3qWMUnkGGKpBUnhYsm5qB0HbParAgeW0mJnLwJhnFLmIZuiBnEEX fFRjAIoCIya2/w/oiHdER4RtQqToJHFhxwHTfwSly2h+sIiupQUZSbGE61+2NNGO+NV5 D2QEQLZzR9ruc2czO8Zi/B+BgMfs6/kAAoLqqlfn0ji7cdY9rkgi/0ENl1dKuNbV6DWe qjmwANvx1lmzEVM6zP70L/+iCFMgCVMwVoMHZSFvSofaZTBau38MK6v3nZ0KLj9ZkXi/ wPgqPxb3RxkhMRsOBqPPe3lHv01WvOdzCGXmrM400ibxpBD/YYvi7SrlfOSvgc2gUYKN sq6g== 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=R9AIQVExF9nV9YtZu5lwedacFg/Pgl2v3XvW/bExTZKtq8UfPd14y3Fmg7ur5YIysR 40h+sPsnbavHz4hDTzReISXiIKpYPyH0Kx3Hkpp966MiaqNej58WM9uL/O4tVQHF8RWa vnbycy7f2BxeUlGxQDCxwPWbkPzG2uiw3JfajRBr2MaTiDA/Zr8F3Y9XT7bftx9mo5uL 7DcY973K6RjN6mA0fFWmF5bAcNMmp31A2sVk7sXuuwL2iySJn6Uk3YAD/68A0zm8/1YR R/HZxji5aXmxELUZbQYUqoJKCW7zpUwQgvoGk2fmxSLmytATSwseYe3iY2GdRO+yqm+X XBzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=WHUWCtat; 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 b6si7343007edd.632.2022.02.18.11.12.41; Fri, 18 Feb 2022 11:12:41 -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=WHUWCtat; 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 4FA7968A305; Fri, 18 Feb 2022 21:12:23 +0200 (EET) 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 49004680266 for ; Fri, 18 Feb 2022 21:12:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645211528; 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=WHUWCtat/SEBrRliVASWoh3MevsumSecBUhvPH7IjcjHec7WCHFdcRL2jToLGr9b9 qxNAXSjk9+RlTtpZTxohlmP/cFCHy6iHzVm2WIUoSaYQtEudFmWu8oBgY+bxjc0y+j e77XEq7Qsx6+Q9ROQPLgM2H5IIDTmCsCIiOls4+E= Received: by b-5.in.mailobj.net [192.168.90.15] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 18 Feb 2022 20:12:08 +0100 (CET) X-EA-Auth: OMDdQk6DkyYce54jq2KfwmKPgcz5soSr5pnlgAHzcJp3h/716KZpbD2c+tj9XpF1iy9a4kCoNqyztVDPsTusURvEn9kQsWBocvRiXRsYumc= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 22:11:53 +0300 Message-Id: <20220218191157.15429-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220218191157.15429-1-nil-admirari@mailo.com> References: <20220218191157.15429-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 2/6] 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: ggcO9jl0pkcX --- 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