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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 125f3151cb30ebce6473368552be3bbc786ff18a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=125f3151cb30ebce6473368552...

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Thu Jul 16 11:56:08 2015 +0100

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

---

 dlls/wbemprox/service.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c
index 95a21b5..b096c5c 100644
--- 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;
 }