Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 09:50:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32] ReplaceFileW:

Browse source 
- Initialize Unicode string structure, so that only allocated buffers are freed when leaving the function
- Fixes several heap warnings in kernel32:file test

svn path=/trunk/; revision=47407
This commit is contained in:
Gregor Schneider 2010-05-29 12:31:48 +00:00
parent 24dd4301ad
commit c8e90e9d05
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/dll/win32/kernel32/file/file.c
View file

@ -1906,7 +1906,8 @@ ReplaceFileW(
) )
{ {
HANDLE hReplaced = NULL, hReplacement = NULL; HANDLE hReplaced = NULL, hReplacement = NULL;
UNICODE_STRING NtReplacedName, NtReplacementName; UNICODE_STRING NtReplacedName = { 0, 0, NULL };
UNICODE_STRING NtReplacementName = { 0, 0, NULL };
DWORD Error = ERROR_SUCCESS; DWORD Error = ERROR_SUCCESS;
NTSTATUS Status; NTSTATUS Status;
BOOL Ret = FALSE; BOOL Ret = FALSE;
@ -2029,8 +2030,10 @@ Cleanup:
if (hReplacement) NtClose(hReplacement); if (hReplacement) NtClose(hReplacement);
if (Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); if (Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer);
RtlFreeUnicodeString(&NtReplacementName); if (NtReplacementName.Buffer)
RtlFreeUnicodeString(&NtReplacedName); RtlFreeHeap(GetProcessHeap(), 0, NtReplacementName.Buffer);
if (NtReplacedName.Buffer)
RtlFreeHeap(GetProcessHeap(), 0, NtReplacedName.Buffer);
/* If there was an error, set the error code */ /* If there was an error, set the error code */
if(!Ret) if(!Ret)