From patchwork Sat Feb 19 09:56:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34407 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1692466nkx; Sat, 19 Feb 2022 01:57:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJzCzE2UmXfpMck2mLUGDhoBOiNmPj/mimlRXarpzdCzbthYwzQJXCBFqp704Q2ZpB6+Gj3k X-Received: by 2002:a17:906:a85:b0:6d0:827a:89d0 with SMTP id y5-20020a1709060a8500b006d0827a89d0mr8235139ejf.230.1645264655487; Sat, 19 Feb 2022 01:57:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645264655; cv=none; d=google.com; s=arc-20160816; b=b7ZF/hGoRM3+YBP2/8YuE1wR40lLKiNXwSTOlGTIUACqntlsyZyXKl2oqcDokOdtmm OlIE9DWQfABZrHPWgErkUKbdF2XK1QkGxjUM732pI0FkTNDLMHjoKY3/rqw86VF2UhRy PiCggaF15bgYVuGnoKA21G5wRgTfpLKsoyGrgs0PRheCNH4/TRuEmlUYLxpJJM/gTwGG wMK6ivOvOfiTkiMI+YWThey+cnBqYWCyoC407Zmm/gvNXChuv7V3JvszVa4qRxGdiNI+ fCICfcEUDYayr1kWjijJYpxy/q+UbOTFo2bcCcdXMet1U+iYdLybbOqDNN5bea5nPTeI i26Q== 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=xw7Cj+UJEsLYW5gd2dGTMvW/uUkVNCpFVmnOsAn9kU4=; b=MFVIHab+e/3lqfGk7Zrxi6LDQQbVkEEDJ5PJGGAHNJbcnLErWeho5+rItLq3mwu7iW pjP43LU314dj+Ht0sDJ8UxJrWt0CLxoARKyDtTNtLfdWCVsTINn+1ii1fEsH48mZAOS+ KbDuBPQlamACHSxvKM9ipDIKa5IqgYnHsCX3hT4nqV7ODjODJ3fQL/lP7Vj4/5ztKFwU kOOAtnsRlIjsBdQtFckfvzdZ/qX0rUjmp2Y2g2QfelG+ECvfVN2sUwpfglDvDAkTZBek 6pJUG4V05Ph1Lme/anrK0JA8Kvfbi5ip/bwYynJkTQ3DiU7BJhGc29KY1btAcqZ+WEbQ 02lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=DJOcmMXh; 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 w25si7740712edt.600.2022.02.19.01.57.35; Sat, 19 Feb 2022 01:57:35 -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=DJOcmMXh; 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 B034568B19F; Sat, 19 Feb 2022 11:56:53 +0200 (EET) 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 32B7068B0CD for ; Sat, 19 Feb 2022 11:56:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645264596; bh=v0NXlsvOi2QMYMh51jQD1B6JipWxNNrVG0rV2ZtjWAQ=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=DJOcmMXh1eFHhlVG3AOrYe9kuG5eIE23/AauSoXP32uPbAApJ66L775yds5TdVCxz Sryc/Ic+6gDVxGB0NyYiOFu8ZXXQMaLtVKlRbhfFoD2mL1YLPLOlPoE3yGhwbgg0qw wiwnMUeKMMNkS65xJgXEHi1ZtgBob/zGezd5MMG4= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Sat, 19 Feb 2022 10:56:36 +0100 (CET) X-EA-Auth: OtCLGuJF4c+Vq+Ldx7mWEhJQq5V+oVqDfxeJ8cUz2gEvlFuO7KlCE3CWkyweQbba0iYk1USsb+wHFnRz4hznqiHqqmd0mhR9608osOMUzbI= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 12:56:19 +0300 Message-Id: <20220219095623.9417-2-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220219095623.9417-1-nil-admirari@mailo.com> References: <20220219095623.9417-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 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: +o41+XjDlEHh --- libavformat/avisynth.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 2bd0c69..e28d832 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 @@ -793,8 +794,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)) @@ -802,10 +802,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