From patchwork Wed Feb 16 15:08:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34341 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp1304257nkf; Wed, 16 Feb 2022 07:10:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJy65/gsz6ItQPN2LKigJToKTYymQlMus802U7sx+Bq4TO1xctURmgY/pNnuzJLQ5zO9IveI X-Received: by 2002:a05:6402:5110:b0:410:cc66:4d5c with SMTP id m16-20020a056402511000b00410cc664d5cmr3549577edd.93.1645024204725; Wed, 16 Feb 2022 07:10:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645024204; cv=none; d=google.com; s=arc-20160816; b=wZ2I6mOQa/AoZvskyC5yA17l7jQs/rpw5NPhGR8J8+j8e+pSviPnSPy4eFB2IP5zYg rOc9JaGGgsvOav+2LC1N+NXNs7xzlq3CXjzpNiBEzIsbvCFHUo8nMFWGczVxyeY4lhy9 h4OMtQA9J7EploVK00vYDVCLNT7n99SwHnvoIKOfALVxX1BAXbjx8+hE7km8e3gCoK0W hdUqH2AN5QhXVUKGFGfzNJwY3l5bNsuF9C6g0XM8QPscCoAfm6B7cT2eq+fnaYihG7uW IaOyBm7Ws5Ue/qW+uLa5LrAEu9Gnh1GDtAno3Nf9x+LbauZmNHVKqE//WGLTfDbALacn DhtA== 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=Jus3V+hYsx0Sk6+ULPS4YUwfqYazm/2FDMP3GUECa98=; b=FQ2v8bvC0SGJfgGn+LCpbkD0q9kW+czMfIEshAfK+S5cUKcRk/QrLJV2o/KoYnve2M d0wqN0B/QxIC1T+wjTCU2yxIAdexnxIGaJw71OBYshrvrpaZ3MwkYsldfWsXaskKeKEa vTJMJJTStQILZKueyUA5dOTQBM2oflAQT1G0DB59FXw4rKeS9bjLhNKqt2IyyoeScqNv pgtEHAMtet8NntZqjYLIyEajm5rh95g/rRBSl41oD2VWxvg+8+c2HzJjw7+b27yqY53w EI1x8fCHlQ3oHyZVLIUwI6U4XmK0wb92ZETwIUrcn89I8PX0R7HcpsYXH8MmwFAPTUtF +wug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=eF6JUbjY; 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 gj11si4616452ejb.659.2022.02.16.07.09.49; Wed, 16 Feb 2022 07:10:04 -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=eF6JUbjY; 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 3266268B1A0; Wed, 16 Feb 2022 17:09:23 +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 B427668B209 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=1645024152; bh=ihJmQtPkMxCXyMfDX/vGTU/uwt1eFCciJKErDl6EH80=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=eF6JUbjYCodQYIPEO4UVo24Kwq2hl2NdiBvhS7Gi6gU6wsAOScj/H8r7pEMym2w/m ksGeqqxZzfZZ91j93UOOJqeybosBAq1v2X1lNIjyqYeKJ5Ft0DDtFFG/TXH8pJjdfE zDGKq0pVQCcI0pdzLZjTHQXjfRBHPZhUzRWSEQrg= 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:12 +0100 (CET) X-EA-Auth: VSE95oeP9LbS2Tl0e1c/4Xi0dNPUiGk/seTyaCVbN8KtZVICOxMIPTRRTqAzl1AKqLy8JROpNRhQSl8aZjPM1J5KINOn9FYsrizMR23rsMQ= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Feb 2022 18:08:58 +0300 Message-Id: <20220216150859.16844-4-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 4/5] fftools/cmdutils.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: zkbmmqn9ojze --- fftools/cmdutils.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4b50e15..ea78897 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -62,6 +62,7 @@ #endif #ifdef _WIN32 #include +#include "compat/w32dlfcn.h" #endif static int init_report(const char *env); @@ -2065,6 +2066,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, { FILE *f = NULL; int i; +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + char *datadir = NULL; +#endif const char *base[3] = { getenv("FFMPEG_DATADIR"), getenv("HOME"), FFMPEG_DATADIR, }; @@ -2074,19 +2078,31 @@ FILE *get_preset_file(char *filename, size_t filename_size, f = fopen(filename, "r"); } else { #if HAVE_GETMODULEHANDLE && defined(_WIN32) - char datadir[MAX_PATH], *ls; + wchar_t *datadir_w = get_module_filename(NULL); base[2] = NULL; - if (GetModuleFileNameA(GetModuleHandleA(NULL), datadir, sizeof(datadir) - 1)) + if (wchartoansi(datadir_w, &datadir)) + datadir = NULL; + av_free(datadir_w); + + if (datadir) { - for (ls = datadir; ls < datadir + strlen(datadir); ls++) + char *ls; + for (ls = datadir; *ls; ls++) if (*ls == '\\') *ls = '/'; if (ls = strrchr(datadir, '/')) { - *ls = 0; - strncat(datadir, "/ffpresets", sizeof(datadir) - 1 - strlen(datadir)); - base[2] = datadir; + const int datadir_len = ls - datadir; + const int desired_size = datadir_len + strlen("/ffpresets") + 1; + char *new_datadir = av_realloc_array( + datadir, desired_size, sizeof *datadir); + if (new_datadir) { + datadir = new_datadir; + datadir[datadir_len] = 0; + strncat(datadir, "/ffpresets", desired_size - 1 - datadir_len); + base[2] = datadir; + } } } #endif @@ -2106,6 +2122,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, } } +#if HAVE_GETMODULEHANDLE && defined(_WIN32) + av_free(datadir); +#endif return f; }