ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Jacek Caban 2020-04-06 19:43:12 +02:00 committed by Alexandre Julliard
parent ceae3f0207
commit 5bc58410f2
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/dbghelp/elf_module.c
View File

@ -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);
}

10
dlls/dbghelp/macho_module.c
View File

@ -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)