mstask: Fix some memory leaks on error path (Valgrind).

Signed-off-by: Sven Baars <sven.wine@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mstask: Fix some memory leaks on error path (Valgrind).
3804b99e · Sven Baars · Alexandre Julliard · 48e6f8f9 · 3804b99e
Commit 3804b99e authored Feb 06, 2019 by Sven Baars Committed by Alexandre Julliard Feb 06, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 7 deletions

task.c dlls/mstask/task.c +14 -7

No files found.
--- a/dlls/mstask/task.c
+++ b/dlls/mstask/task.c
@@ -1690,7 +1690,11 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta
        hfile = CreateFileW(task_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, disposition, 0, 0);
        if (hfile != INVALID_HANDLE_VALUE) break;
-        if (try++ >= 3) return HRESULT_FROM_WIN32(GetLastError());
+        if (try++ >= 3)
+        {
+            hr = HRESULT_FROM_WIN32(GetLastError());
+            goto failed;
+        }
        Sleep(100);
    }
@@ -1781,13 +1785,16 @@ failed:
        CoTaskMemFree(comment);
    CoTaskMemFree(user_data);
-    CloseHandle(hfile);
+    if (hfile != INVALID_HANDLE_VALUE)
-    if (hr != S_OK)
-        DeleteFileW(task_name);
-    else if (remember)
    {
-        heap_free(This->task_name);
+        CloseHandle(hfile);
-        This->task_name = heap_strdupW(task_name);
+        if (hr != S_OK)
+            DeleteFileW(task_name);
+        else if (remember)
+        {
+            heap_free(This->task_name);
+            This->task_name = heap_strdupW(task_name);
+        }
    }
    return hr;
 }