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

kernel32: Make sure the string is properly terminated in QueryFullProcessImageNameW.

This commit is contained in:
Alexandre Julliard 2009-04-22 16:54:16 +02:00
parent b485ed2346
commit c6083037a8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/kernel32/process.c
View File

@ -3158,10 +3158,11 @@ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lp
RtlInitUnicodeStringEx(&nt_path, NULL);
/* FIXME: On Windows, ProcessImageFileName return an NT path. We rely that it being a DOS path,
* as this is on Wine. */
status = NtQueryInformationProcess(hProcess, ProcessImageFileName, buffer, sizeof(buffer), &needed);
status = NtQueryInformationProcess(hProcess, ProcessImageFileName, buffer,
sizeof(buffer) - sizeof(WCHAR), &needed);
if (status == STATUS_INFO_LENGTH_MISMATCH)
{
dynamic_buffer = HeapAlloc(GetProcessHeap(), 0, needed);
dynamic_buffer = HeapAlloc(GetProcessHeap(), 0, needed + sizeof(WCHAR));
status = NtQueryInformationProcess(hProcess, ProcessImageFileName, (LPBYTE)dynamic_buffer, needed, &needed);
result = dynamic_buffer;
}
@ -3172,6 +3173,7 @@ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lp
if (dwFlags & PROCESS_NAME_NATIVE)
{
result->Buffer[result->Length / sizeof(WCHAR)] = 0;
if (!RtlDosPathNameToNtPathName_U(result->Buffer, &nt_path, NULL, NULL))
{
status = STATUS_OBJECT_PATH_NOT_FOUND;
@ -3186,8 +3188,9 @@ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lp
goto cleanup;
}
lstrcpynW(lpExeName, result->Buffer, result->Length/sizeof(WCHAR) + 1);
*pdwSize = result->Length/sizeof(WCHAR);
memcpy( lpExeName, result->Buffer, result->Length );
lpExeName[*pdwSize] = 0;
cleanup:
HeapFree(GetProcessHeap(), 0, dynamic_buffer);