From: Thomas Faber <thomas.faber@reactos.org>
Date: Mon, 12 May 2014 06:19:07 +0000 (+0000)
Subject: [CMD]
X-Git-Tag: backups/0.3.17@66124~1298
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=dbe30dfb594740e5a3606c82499648b09e9d0423

[CMD]
- Fix mismatched allocation/free. Spotted by Samuel & cppcheck
CORE-8207 #resolve

svn path=/trunk/; revision=63249
---

diff --git a/reactos/base/shell/cmd/copy.c b/reactos/base/shell/cmd/copy.c
index a5f896d17dd..c5c127f573b 100644
--- a/reactos/base/shell/cmd/copy.c
+++ b/reactos/base/shell/cmd/copy.c
@@ -200,7 +200,7 @@ copy(TCHAR source[MAX_PATH],
     }
 
     /* A page-aligned buffer usually give more speed */
-    buffer = (LPBYTE)VirtualAlloc(NULL, BUFF_SIZE, MEM_COMMIT, PAGE_READWRITE);
+    buffer = VirtualAlloc(NULL, BUFF_SIZE, MEM_COMMIT, PAGE_READWRITE);
     if (buffer == NULL)
     {
         CloseHandle (hFileDest);
diff --git a/reactos/base/shell/cmd/replace.c b/reactos/base/shell/cmd/replace.c
index 4b139c82e5a..864e3fb6e24 100644
--- a/reactos/base/shell/cmd/replace.c
+++ b/reactos/base/shell/cmd/replace.c
@@ -160,7 +160,7 @@ INT replace(TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], DWORD dwFlags, BOOL *d
     }
 
     /* Get buffer for the copy process */
-    buffer = (LPBYTE)VirtualAlloc(NULL, BUFF_SIZE, MEM_COMMIT, PAGE_READWRITE);
+    buffer = VirtualAlloc(NULL, BUFF_SIZE, MEM_COMMIT, PAGE_READWRITE);
     if (buffer == NULL)
     {
         CloseHandle (hFileDest);
@@ -188,7 +188,7 @@ INT replace(TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], DWORD dwFlags, BOOL *d
         if (dwWritten != dwRead || CheckCtrlBreak(BREAK_INPUT))
         {
             ConOutResPuts(STRING_COPY_ERROR3);
-            cmd_free (buffer);
+            VirtualFree (buffer, 0, MEM_RELEASE);
             CloseHandle (hFileDest);
             CloseHandle (hFileSrc);
             nErrorLevel = 1;