Merge remote-tracking branch 'upstream/v1.x' into v1.x

zelang-dev · Dec 9, 2023 · 7b4219f · 7b4219f
2 parents 950dc75 + 5e30273
commit 7b4219f
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/win/process.c b/src/win/process.c
@@ -377,11 +377,13 @@ static WCHAR* search_path(const WCHAR *file,
   } else {
     dir_end = path;
 
-    /* The file is really only a name; look in cwd first, then scan path */
-    result = path_search_walk_ext(L"", 0,
-                                  file, file_len,
-                                  cwd, cwd_len,
-                                  name_has_ext);
+    if (NeedCurrentDirectoryForExePathW(L"")) {
+      /* The file is really only a name; look in cwd first, then scan path */
+      result = path_search_walk_ext(L"", 0,
+                                    file, file_len,
+                                    cwd, cwd_len,
+                                    name_has_ext);
+    }
 
     while (result == NULL) {
       if (dir_end == NULL || *dir_end == L'\0') {