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

dbghelp: Accept NULL search path in SymSetSearchPath. 

Fixes a crash when starting kernrate.exe.

Signed-off-by: Thomas Faber <thomas.faber@reactos.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Thomas Faber 2021-11-12 18:11:48 -05:00 committed by Alexandre Julliard
parent cb8aef440e
commit 06f1c40f17
1 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
dlls/dbghelp/dbghelp.c
View File

@ -175,6 +175,36 @@ struct cpu* cpu_find(DWORD machine)
return NULL; return NULL;
} }
static WCHAR* make_default_search_path(void)
{
WCHAR* search_path;
unsigned size;
unsigned len;
search_path = HeapAlloc(GetProcessHeap(), 0, (len = MAX_PATH) * sizeof(WCHAR));
while ((size = GetCurrentDirectoryW(len, search_path)) >= len)
search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (len *= 2) * sizeof(WCHAR));
search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (size + 1) * sizeof(WCHAR));
len = GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", NULL, 0);
if (len)
{
search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (size + 1 + len + 1) * sizeof(WCHAR));
search_path[size] = ';';
GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", search_path + size + 1, len);
size += 1 + len;
}
len = GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", NULL, 0);
if (len)
{
search_path = HeapReAlloc(GetProcessHeap(), 0, search_path, (size + 1 + len + 1) * sizeof(WCHAR));
search_path[size] = ';';
GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", search_path + size + 1, len);
}
return search_path;
}
/****************************************************************** /******************************************************************
* SymSetSearchPathW (DBGHELP.@) * SymSetSearchPathW (DBGHELP.@)
* *
@ -182,14 +212,24 @@ struct cpu* cpu_find(DWORD machine)
BOOL WINAPI SymSetSearchPathW(HANDLE hProcess, PCWSTR searchPath) BOOL WINAPI SymSetSearchPathW(HANDLE hProcess, PCWSTR searchPath)
{ {
struct process* pcs = process_find_by_handle(hProcess); struct process* pcs = process_find_by_handle(hProcess);
WCHAR* search_path_buffer;
if (!pcs) return FALSE; if (!pcs) return FALSE;
if (!searchPath) return FALSE;
if (searchPath)
{
search_path_buffer = HeapAlloc(GetProcessHeap(), 0,
(lstrlenW(searchPath) + 1) * sizeof(WCHAR));
if (!search_path_buffer) return FALSE;
lstrcpyW(search_path_buffer, searchPath);
}
else
{
search_path_buffer = make_default_search_path();
if (!search_path_buffer) return FALSE;
}
HeapFree(GetProcessHeap(), 0, pcs->search_path); HeapFree(GetProcessHeap(), 0, pcs->search_path);
pcs->search_path = lstrcpyW(HeapAlloc(GetProcessHeap(), 0, pcs->search_path = search_path_buffer;
(lstrlenW(searchPath) + 1) * sizeof(WCHAR)),
searchPath);
return TRUE; return TRUE;
} }
@ -201,16 +241,19 @@ BOOL WINAPI SymSetSearchPath(HANDLE hProcess, PCSTR searchPath)
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
unsigned len; unsigned len;
WCHAR* sp; WCHAR* sp = NULL;
len = MultiByteToWideChar(CP_ACP, 0, searchPath, -1, NULL, 0); if (searchPath)
if ((sp = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR))))
{ {
len = MultiByteToWideChar(CP_ACP, 0, searchPath, -1, NULL, 0);
sp = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
if (!sp) return FALSE;
MultiByteToWideChar(CP_ACP, 0, searchPath, -1, sp, len); MultiByteToWideChar(CP_ACP, 0, searchPath, -1, sp, len);
ret = SymSetSearchPathW(hProcess, sp);
HeapFree(GetProcessHeap(), 0, sp);
} }
ret = SymSetSearchPathW(hProcess, sp);
HeapFree(GetProcessHeap(), 0, sp);
return ret; return ret;
} }
@ -428,29 +471,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP
} }
else else
{ {
unsigned size; pcs->search_path = make_default_search_path();
unsigned len;
pcs->search_path = HeapAlloc(GetProcessHeap(), 0, (len = MAX_PATH) * sizeof(WCHAR));
while ((size = GetCurrentDirectoryW(len, pcs->search_path)) >= len)
pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (len *= 2) * sizeof(WCHAR));
pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (size + 1) * sizeof(WCHAR));
len = GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", NULL, 0);
if (len)
{
pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (size + 1 + len + 1) * sizeof(WCHAR));
pcs->search_path[size] = ';';
GetEnvironmentVariableW(L"_NT_SYMBOL_PATH", pcs->search_path + size + 1, len);
size += 1 + len;
}
len = GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", NULL, 0);
if (len)
{
pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (size + 1 + len + 1) * sizeof(WCHAR));
pcs->search_path[size] = ';';
GetEnvironmentVariableW(L"_NT_ALTERNATE_SYMBOL_PATH", pcs->search_path + size + 1, len);
}
} }
pcs->lmodules = NULL; pcs->lmodules = NULL;