[PATCH v10 3/5] xcopy: Fix leaked resource in an error case.

[Joe Souza]

From: Joe Souza

---
 programs/xcopy/xcopy.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c
index ee30e07b184..a8bd14f1616 100644
--- a/programs/xcopy/xcopy.c
+++ b/programs/xcopy/xcopy.c
@@ -345,7 +345,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
     WCHAR           *inputpath, *outputpath;
     BOOL            copiedFile = FALSE;
     DWORD           destAttribs, srcAttribs;
-    BOOL            skipFile;
+    BOOL            skipFile, quitCopy = FALSE;
     int             ret = 0;

/* Allocate some working memory on heap to minimize footprint */
@@ -359,7 +359,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,

/* Search 1 - Look for matching files */
     h = FindFirstFileW(inputpath, finddata);
-    while (h != INVALID_HANDLE_VALUE && findres) {
+    while (h != INVALID_HANDLE_VALUE && !quitCopy && findres) {

skipFile = FALSE;

@@ -550,11 +550,10 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
                            copyFrom, copyTo, error);
                     XCOPY_FailMessage(error);

-                    if (flags & OPT_IGNOREERRORS) {
-                        skipFile = TRUE;
-                    } else {
+                    skipFile = TRUE;
+                    if (!(flags & OPT_IGNOREERRORS)) {
                         ret = RC_WRITEERROR;
-                        goto cleanup;
+                        quitCopy = TRUE;
                     }
                 } else {

@@ -580,12 +579,14 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
         }

/* Find next file */
-        findres = FindNextFileW(h, finddata);
+        if (!quitCopy) {
+            findres = FindNextFileW(h, finddata);
+        }
     }
     FindClose(h);

/* Search 2 - do subdirs */
-    if (flags & OPT_RECURSIVE) {
+    if (!quitCopy && (flags & OPT_RECURSIVE)) {

/* If /E is supplied, create the directory now */
         if ((flags & OPT_EMPTYDIR) &&
@@ -628,8 +629,6 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
         FindClose(h);
     }

-cleanup:
-
     /* free up memory */
     HeapFree(GetProcessHeap(), 0, finddata);
     HeapFree(GetProcessHeap(), 0, inputpath);