sc: Fix service handle leak on error path (Coverity).

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

sc: Fix service handle leak on error path (Coverity).
0a3e5448 · Nikolay Sivov · Alexandre Julliard · 53a065ae · 0a3e5448
Commit 0a3e5448 authored Nov 22, 2015 by Nikolay Sivov Committed by Alexandre Julliard Nov 25, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

sc.c programs/sc/sc.c +6 -7

No files found.
--- a/programs/sc/sc.c
+++ b/programs/sc/sc.c
@@ -285,15 +285,14 @@ int wmain( int argc, const WCHAR *argv[] )
        if (service)
        {
            SERVICE_FAILURE_ACTIONSW sfa;
-            if (!parse_failure_params( argc - 3, argv + 3, &sfa ))
+            if (parse_failure_params( argc - 3, argv + 3, &sfa ))
            {
-                WINE_WARN("failed to parse failure parameters\n");
-                CloseServiceHandle( manager );
-                return 1;
+                ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa );
+                if (!ret) WINE_TRACE("failed to set service failure actions %u\n", GetLastError());
+                HeapFree( GetProcessHeap(), 0, sfa.lpsaActions );
            }
-            ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa );
-            if (!ret) WINE_TRACE("failed to set service failure actions %u\n", GetLastError());
-            HeapFree( GetProcessHeap(), 0, sfa.lpsaActions );
+            else
+                WINE_WARN("failed to parse failure parameters\n");
            CloseServiceHandle( service );
        }
        else WINE_TRACE("failed to open service %u\n", GetLastError());