From patchwork Mon Mar 28 20:43:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nil Admirari X-Patchwork-Id: 35029 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp524828pzb; Mon, 28 Mar 2022 13:44:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0bvhGOrcP11OtThwGHsoEdISxFepdFDEWkcY2r60cxIM9LwsK30uflPKexbNb6MtO9NeB X-Received: by 2002:a17:906:5418:b0:6df:a07f:764b with SMTP id q24-20020a170906541800b006dfa07f764bmr28868608ejo.27.1648500270937; Mon, 28 Mar 2022 13:44:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648500270; cv=none; d=google.com; s=arc-20160816; b=xXCiskEf2BnPP4RpCEJLhoe6po3Z16Jd52AD6yCHxRMQ+8SiBdo1V3rXjlYEATL4vx 9nwJKzDjqOVh3rAgi2euD1rv1h7TMuGhAK9e+6jQHwgdCYl8hMkzx3wvXED7CuvfMzsC N/XFjgVcaag3MomDKMFqRp9S9v7A+Eg/BWNX/tqdWEGJ+crGoNFgXtwt9DSaLhmGfJ8Y Bf7Aw/BD9VVUBUVfVMURUOkXkBwxQOewwpuMilp6gPFRk+HTzQOwmdqJTAfrB39QR1kX 3uM3JpFThpa3JsHQxUHTzwR6Dul0fGxgAaoL9d+lhj182rLr6mPLhP4bbNwzbpBy0vd5 5Wgg== 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=f8PKOfwjvc+ss0L2y2BSNGwNE+f7/gksta23EogaVTw=; b=xVunwqTry6FAd12CV3XUzNmRJovwrkO/l0gz4FCxCdaaY7ue8Rn9S8V3mv1TOtapGh w3cdelg6jh9k+uWzoFmPsnEu1utMgVjd9AuiHUtV3GEkDN+FDJYWBTI5TNHnHJLoPxZq j2B8obxUsai8+L/vt3OxTRwXi5hWqwh8wB6YCBFBp0cIoHB0pomhlz5MzEqmtVc3boN7 TQEc7e7ZGJSg1o4DFlvzWynvCVTJgd2amDDqYxZkiKbM5o38fLRTPpVRDivX+UavWES+ Pj4HuFpmEsdK5tmA336uIXPMCPOBK4IjdUViubxZIYjyEi73tEgVKHQSHqY99jLALjjt QSrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mailo.com header.s=mailo header.b=LRSPALyS; 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 zg24-20020a170907249800b006dfcc3f8234si15443754ejb.436.2022.03.28.13.44.30; Mon, 28 Mar 2022 13:44:30 -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=LRSPALyS; 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 CAE8B68B2AF; Mon, 28 Mar 2022 23:44:10 +0300 (EEST) 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 0FC2D68B1AD for ; Mon, 28 Mar 2022 23:44:01 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1648500234; bh=/CLGaJOdQCRilR9ljsSQmkvgCbVLgfoQOyoNWnSPo60=; h=X-EA-Auth:From:To:Subject:Date:Message-Id:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding; b=LRSPALySjNgk34kEpP4rkHdB0kLZZrmQ6aXwtfwWIJR9s47kYQFiP3RjT8trw1AKI vdyL9qoDjiFobgmsnnRjTRbwLQsZd1pghU0KcILo0Rvh4rNITssxnsf7a8xijR3/u3 3MSoa1HUSspq44fOA0wAx+0Z/Q0pDRXdbZUgqd5Y= Received: by b-6.in.mailobj.net [192.168.90.16] with ESMTP via ip-206.mailobj.net [213.182.55.206] Mon, 28 Mar 2022 22:43:54 +0200 (CEST) X-EA-Auth: AYBqWXzvFu4zQDDGRz5rmqR6NaVOgeP7GhIOV2eMsiADw+G0gY/q2Q1gfNFqcqd6iehVkzyWZuKmzbyEPOAUk94DbDdWjsF8RjBiAAX5gn8= From: Nil Admirari To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 23:43:36 +0300 Message-Id: <20220328204339.13009-3-nil-admirari@mailo.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220328204339.13009-1-nil-admirari@mailo.com> References: <20220328204339.13009-1-nil-admirari@mailo.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 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: PtiWtGVMSVLS --- compat/w32dlfcn.h | 78 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 14 deletions(-) diff --git a/compat/w32dlfcn.h b/compat/w32dlfcn.h index 52a94ef..0f41f50 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)