commit ad4a20b87d79a619ffbdea3f26848780899494e5
author Steve Dower <steve.dower@python.org> Thu Jan 30 17:18:25 2020 +1100
committer GitHub <noreply@github.com> Wed Jan 29 22:18:25 2020 -0800
tree f85a50746f1c1209db64f26299f5b842ee4b32a9
parent 58076df0c59677111dc77b72852cb2a313a2ef91

[3.8] bpo-39401: Avoid unsafe DLL load on Windows 7 and earlier (GH-18231) (GH-18234)



https://bugs.python.org/issue39401



Automerge-Triggered-By: @zooba

PC/getpathp.c

diff --git a/PC/getpathp.c b/PC/getpathp.c
index 04f24d9..3747ffb 100644
--- a/PC/getpathp.c
+++ b/PC/getpathp.c
@@ -251,7 +251,8 @@
 join(wchar_t *buffer, const wchar_t *stuff)
 {
     if (_PathCchCombineEx_Initialized == 0) {
-        HMODULE pathapi = LoadLibraryW(L"api-ms-win-core-path-l1-1-0.dll");
+        HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL,
+                                         LOAD_LIBRARY_SEARCH_SYSTEM32);
         if (pathapi) {
             _PathCchCombineEx = (PPathCchCombineEx)GetProcAddress(pathapi, "PathCchCombineEx");
         }
@@ -287,7 +288,8 @@
     }
 
     if (_PathCchCanonicalizeEx_Initialized == 0) {
-        HMODULE pathapi = LoadLibraryW(L"api-ms-win-core-path-l1-1-0.dll");
+        HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL,
+                                         LOAD_LIBRARY_SEARCH_SYSTEM32);
         if (pathapi) {
             _PathCchCanonicalizeEx = (PPathCchCanonicalizeEx)GetProcAddress(pathapi, "PathCchCanonicalizeEx");
         }