wbemprox: Don't call CloseServiceHandle() with an invalid handle.

125f3151 · Huw Davies · Alexandre Julliard · 3e7f0e68 · 125f3151
Commit 125f3151 authored Jul 16, 2015 by Huw Davies Committed by Alexandre Julliard Jul 16, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

service.c dlls/wbemprox/service.c +4 -4

No files found.
--- a/dlls/wbemprox/service.c
+++ b/dlls/wbemprox/service.c
@@ -69,11 +69,11 @@ static HRESULT control_service( const WCHAR *name, DWORD control, VARIANT *retva
        goto done;
    }
    if (!ControlService( service, control, &status )) error = map_error( GetLastError() );
+    CloseServiceHandle( service );

 done:
    set_variant( VT_UI4, error, NULL, retval );
-    CloseServiceHandle( service );
-    CloseServiceHandle( manager );
+    if (manager) CloseServiceHandle( manager );
    return S_OK;
 }

@@ -183,11 +183,11 @@ static HRESULT start_service( const WCHAR *name, VARIANT *retval )
        goto done;
    }
    if (!StartServiceW( service, 0, NULL )) error = map_error( GetLastError() );
+    CloseServiceHandle( service );

 done:
    set_variant( VT_UI4, error, NULL, retval );
-    CloseServiceHandle( service );
-    CloseServiceHandle( manager );
+    if (manager) CloseServiceHandle( manager );
    return S_OK;
 }