From ef85e78ddd8639fffd67f4ce34f4a12ac242cc65 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Sun, 2 Jan 2011 16:54:00 +0000 Subject: [PATCH] [KERNEL32] - Fix heap corruptions in MoveFileWithProgress - Fixes kernel32_winetest change crash - Introduced in rev 18073 (25.Sept 2005) svn path=/trunk/; revision=50262 --- reactos/dll/win32/kernel32/file/move.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/kernel32/file/move.c b/reactos/dll/win32/kernel32/file/move.c index 846d78cb976..cfbe5f2dfb5 100644 --- a/reactos/dll/win32/kernel32/file/move.c +++ b/reactos/dll/win32/kernel32/file/move.c @@ -418,7 +418,7 @@ MoveFileWithProgressW ( /* Get the file name */ memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); - if (hFile == NULL) + if (hFile == INVALID_HANDLE_VALUE) loop=FALSE; if (findBuffer.cFileName[0] == L'\0') @@ -446,14 +446,14 @@ MoveFileWithProgressW ( { size = wcslen(lpExistingFileName2)-4; FindClose(hFile); + hFile = INVALID_HANDLE_VALUE; + wcscpy( &lpExistingFileName2[size],L"\0"); if (wcsncmp(lpExistingFileName,lpExistingFileName2,size)) { DWORD Attributes; - FindClose(hFile); - /* delete folder */ TRACE("MoveFileWithProgressW : Delete folder : %S\n",lpDeleteFile);