From patchwork Fri Feb 18 19:11:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 34394 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1213649nkx; Fri, 18 Feb 2022 11:13:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwJ0k5auaWI/ghcNoTNN3316wPaedANXOTpyxXJC2XAgY9BcAA7Lulv6WaEtY9cGN9gxDOW X-Received: by 2002:a17:906:b57:b0:6ce:e31a:524 with SMTP id v23-20020a1709060b5700b006cee31a0524mr7486879ejg.290.1645211581604; Fri, 18 Feb 2022 11:13:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645211581; cv=none; d=google.com; s=arc-20160816; b=P1zAoG+4bIjkpvA8lidMiby96B4lKIQbObO3ew9T6vqdMl0rkw76OrcozXr5sbrRRF G4CGuJEmPl7YdcRda7/tPHrk/OL0rM19jFfNYr65aAXuFkzugcDyPxEJ0e/sKH2Py25G IfAagqq5IZYUv/YUq91BSQnCpxLzjQ2eRIz6JsyQvGP64z/Z4IEBUJJRA0YdgemAJ1AI 8m+0xVKonNuSnGS6H1Oe3kh6lNuJ0Olb9JtHJ8pPARukIBcUUhCRsjv+p37nA4kj382p 6FegfnL6dCkb9IqIxziMfcLL8wg7nOe+VxMdxtcscjqu7aK2/SPT5DoupPrhh1vhXa9H H5qg== 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=03YIEkZyUApjKK5cAlr7LhmqJAA1Ac/Q+YnCfI0SRaPefTe1u5aavZimUpj5C4xw1V bnoPk2rSJcXAobEzVxVRkIRy62YBB1ZgI27CbdnHxYCl+frAvplGMN6ccD1+UyF6SV31 +UqaxD+DgV6l7uyIPnXFemZ4V6tCy8Xe5ti66VPPvNFfzPk06TBHExNX/+4dwdXqAWyP f3yJKc3C2bxHTmbXUYBwP42dWYQZVnNgeLfWBpX8ge/i/YkcFTwl58dwYuBXD17tDlII drPNIxKfTLJpBc2gm4YpoYzk0j4tdU/DJPirPKG2FswwcFbuwPbOykfdYr8kpmKVyiQB 3prg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=mNykK1nI; 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 ca20si6266448edb.378.2022.02.18.11.13.01; Fri, 18 Feb 2022 11:13:01 -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=mNykK1nI; 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 5E24F68A927; Fri, 18 Feb 2022 21:12:26 +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 361046801C8 for ; Fri, 18 Feb 2022 21:12:19 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1645211529; 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=mNykK1nIQbM9hcVLcJrkEhmnztf1xDyn7dtOJbzC0pGDI3GIYv12rNGlp4TqcFiWf qfVFKu2gW4KFaWg73rf+asqzsQ3sK/9ZlnNIjOAXgMsvzyAxj8I6u+VzBiAYC6lij5 5Kd0T5NTxfYl5jFPrk+tVyimXDzBdiBvBGYGzBL4= 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:09 +0100 (CET) X-EA-Auth: T+e8auSFOgW+XKfxBK4Jl+S9/0JDWMukDswyjEnFjm9nMjW6MD0ld6qMCtGRHV5FZ9UxzeDkWdyBtUbswZfpSf4WBicW+l2mYNCz7FGBGGU= From: nihil-admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Feb 2022 22:11:55 +0300 Message-Id: <20220218191157.15429-4-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 4/6] 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: 42QB3Og6I4qT --- 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; }