From patchwork Fri Apr 15 08:07:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35325 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp158553pzh; Fri, 15 Apr 2022 01:08:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUjguU9fqMoB3PHj6zrabgJnqGkI1P/7jQypiTQqZy4Kcx0nJkzeJ2pPEepzzDUjEYBkMK X-Received: by 2002:a17:907:16a2:b0:6e8:d71a:79af with SMTP id hc34-20020a17090716a200b006e8d71a79afmr5183055ejc.410.1650010130783; Fri, 15 Apr 2022 01:08:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650010130; cv=none; d=google.com; s=arc-20160816; b=vTowvAALfOZ1yXCRinSUizxoKNL9wTxSS2UPngpY839X/GEf+LWKvcGbpyqZ59V7nC zze42GgV7ZQPj9XejbpveCxTVlPwrHHRKuWzrvF3qe44Cn1SqFzsNob3W3EcwOnIyCbp WjZf+TUW+MktqYX/qDGgGgvG8sVIp5oxJfxr/uSnF50qTQ02Io6Cp0oMkiTGrG8dQjew zUiBftLXalF78KMkd7uVv1PbX52muhiGB8P9gXprnXB1gn/R1J3UxkTXMcTZnXWpc9bG P10zy0JBPq+J3Ku/qquuj/9I1AGwFukxor0yGfCv8VyOMuKzittU2Cv7YEDvKrHOoInf to4A== 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=0lgx+E+cwBgEHEtMWpjjtmxSaPCo1vH/aiDj6mioF3o=; b=zZclQ4Hn40n+RbaGXA0snzl7nI/0yTsH/Pc5Ozsz9fbfvWZ0Gwwg8leqcNNin3EC+v 5ypXKPbhyzEf9ajVWqEckGLEOJpp7rpepcdSmDfO/k/+gB26hsdeRy/T4qgioH5IrCwk 6PZiow7jvK0Zd5F/4sJ832X3QEJbam8zHPDVAewZMwdL1Agr7vveoHLCJQM5UDSo437I DO6l7Fr9FzB0bKlzmzLXiqGDMjcLB451YJbfSM6tQHSdbocWGbT+m3JUfFmIW6K3/wKM HS2ApxDjjtYpL1WZL4VkAWWFtRgiMEUH/WZgQRzzmNy0CgeBm8MJslRT9MpcS/HZOZ8p bW+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=avSv5iro; 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 c25-20020a170906695900b006df76385d13si598390ejs.435.2022.04.15.01.08.50; Fri, 15 Apr 2022 01:08:50 -0700 (PDT) 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=avSv5iro; 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 39DD668B3D6; Fri, 15 Apr 2022 11:08:24 +0300 (EEST) 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 3F1FD68B3EE for ; Fri, 15 Apr 2022 11:08:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1650010089; bh=9wxrBCrgYoycoM729ZHYfWRL0AKkAnq6wJhJkdzhTms=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=avSv5irorMQ6+LLZPvauyyDbk5UPuVp9+lQF4xI9Zg0wuzfLObY3pMs4+VGhMMUNN Oejs8QrWwnMQs4qBRKyxB+U46Vw+3TGakBt4UT3SoIxyj3KF+zAg+Uq70nS7eDcGVN xiSo/j/NwB+nDIuIrUtz3PTkhze6bEH24lHtICzc= Received: by b-3.in.mailobj.net [192.168.90.13] with ESMTP via ip-206.mailobj.net [213.182.55.206] Fri, 15 Apr 2022 10:08:09 +0200 (CEST) X-EA-Auth: FiXzDqZgpmmoZ662QAqRjmTw7KqylLLJeIitHKqafiagc/VtXmNy+mHNAAF15RbAF25GVLqbXDBQY5IHR1B8/HqJ7vuyD3ez2jbpEsmQdls= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Apr 2022 11:07:45 +0300 Message-Id: <20220415080748.18517-3-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220415080748.18517-1-nil-admirari@mailo.com> References: <20220415080748.18517-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 3/6] compat/w32dlfcn.h: Remove MAX_PATH limit and replace LoadLibraryExA with LoadLibraryExW 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: 2nTZei2XtSbm --- compat/w32dlfcn.h | 78 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 14 deletions(-) diff --git a/compat/w32dlfcn.h b/compat/w32dlfcn.h index 52a94efa..0f41f50b 100644 --- a/compat/w32dlfcn.h +++ b/compat/w32dlfcn.h @@ -25,6 +25,30 @@ #if (_WIN32_WINNT < 0x0602) || HAVE_WINRT #include "libavutil/wchar_filename.h" #endif + +static inline wchar_t *get_module_filename(const HMODULE module) +{ + wchar_t *path = NULL, *new_path = NULL; + DWORD path_size = 0, path_len = 0; + + do { + path_size = path_size ? 2 * path_size : MAX_PATH; + new_path = av_realloc_array(path, path_size, sizeof *path); + if (!new_path) { + av_free(path); + return NULL; + } + path = new_path; + path_len = GetModuleFileNameW(module, path, path_size); + } while (path_len && path_size <= 32768 && path_size <= path_len); + + if (!path_len) { + av_free(path); + return NULL; + } + return path; +} + /** * Safe function used to open dynamic libs. This attempts to improve program security * by removing the current directory from the dll search path. Only dll's found in the @@ -34,29 +58,53 @@ */ static inline HMODULE win32_dlopen(const char *name) { + wchar_t *name_w = NULL; + if (utf8towchar(name, &name_w)) + name_w = NULL; #if _WIN32_WINNT < 0x0602 // Need to check if KB2533623 is available if (!GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "SetDefaultDllDirectories")) { HMODULE module = NULL; - wchar_t *path = NULL, *name_w = NULL; - DWORD pathlen; - if (utf8towchar(name, &name_w)) + wchar_t *path = NULL, *new_path = NULL; + DWORD pathlen, pathsize, namelen; + if (!name_w) goto exit; - path = (wchar_t *)av_calloc(MAX_PATH, sizeof(wchar_t)); + namelen = wcslen(name_w); // Try local directory first - pathlen = GetModuleFileNameW(NULL, path, MAX_PATH); - pathlen = wcsrchr(path, '\\') - path; - if (pathlen == 0 || pathlen + wcslen(name_w) + 2 > MAX_PATH) + path = get_module_filename(NULL); + if (!path) goto exit; - path[pathlen] = '\\'; + new_path = wcsrchr(path, '\\'); + if (!new_path) + goto exit; + pathlen = new_path - path; + pathsize = pathlen + namelen + 2; + new_path = av_realloc_array(path, pathsize, sizeof *path); + if (!new_path) + goto exit; + path = new_path; wcscpy(path + pathlen + 1, name_w); module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (module == NULL) { // Next try System32 directory - pathlen = GetSystemDirectoryW(path, MAX_PATH); - if (pathlen == 0 || pathlen + wcslen(name_w) + 2 > MAX_PATH) + pathlen = GetSystemDirectoryW(path, pathsize); + if (!pathlen) goto exit; - path[pathlen] = '\\'; + // Buffer is not enough in two cases: + // 1. system directory + \ + module name + // 2. system directory even without module name. + if (pathlen + namelen + 2 > pathsize) { + pathsize = pathlen + namelen + 2; + new_path = av_realloc_array(path, pathsize, sizeof *path); + if (!new_path) + goto exit; + path = new_path; + // Query again to handle case #2. + pathlen = GetSystemDirectoryW(path, pathsize); + if (!pathlen) + goto exit; + } + path[pathlen] = L'\\'; wcscpy(path + pathlen + 1, name_w); module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); } @@ -73,15 +121,17 @@ exit: # define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800 #endif #if HAVE_WINRT - wchar_t *name_w = NULL; int ret; - if (utf8towchar(name, &name_w)) + if (!name_w) return NULL; ret = LoadPackagedLibrary(name_w, 0); av_free(name_w); return ret; #else - return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); + /* filename may be be in CP_ACP */ + if (!name_w) + return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); + return LoadLibraryExW(name_w, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32); #endif } #define dlopen(name, flags) win32_dlopen(name)