Module: wine Branch: master Commit: 5bc58410f28aefea3c3f41e056a372aff4dceac7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bc58410f28aefea3c3f41e05...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Apr 6 19:43:12 2020 +0200
dbghelp: Don't use PATH to search for libraries.
It should be used only for the main executable, for which we get full path anyway.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dbghelp/elf_module.c | 3 +-- dlls/dbghelp/macho_module.c | 10 ++-------- 2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 72e9d2124a..a77b034f42 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1435,8 +1435,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, load_elf.dyn_addr = dyn_addr; load_elf.elf_info = elf_info;
- ret = search_unix_path(filename, getenv("PATH"), elf_load_file_cb, &load_elf) - || search_unix_path(filename, getenv("LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf) + ret = search_unix_path(filename, getenv("LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf) || search_dll_path(filename, elf_load_file_cb, &load_elf); }
diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4baf444f9e..3249a7ab2a 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1572,15 +1572,9 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam load_params.load_addr = load_addr; load_params.macho_info = macho_info;
- /* If has no directories, try PATH first. */ + /* Try DYLD_LIBRARY_PATH first. */ p = file_name(filename); - if (p == filename) - { - ret = search_unix_path(filename, getenv("PATH"), macho_load_file_cb, &load_params); - } - /* Try DYLD_LIBRARY_PATH, with just the filename (no directories). */ - if (!ret) - ret = search_unix_path(p, getenv("DYLD_LIBRARY_PATH"), macho_load_file_cb, &load_params); + ret = search_unix_path(p, getenv("DYLD_LIBRARY_PATH"), macho_load_file_cb, &load_params);
/* Try the path as given. */ if (!ret)