Ensure we call CloseServiceHandle() in case of errors.

[tinc] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index 1ef7941..5ba7161 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -722,19 +722,20 @@ static bool remove_service(void) {
        SC_HANDLE manager = NULL;
        SC_HANDLE service = NULL;
        SERVICE_STATUS status = {0};
+       bool success = false;
 
        manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
 
        if(!manager) {
                fprintf(stderr, "Could not open service manager: %s\n", winerror(GetLastError()));
-               return false;
+               goto exit;
        }
 
        service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
 
        if(!service) {
                fprintf(stderr, "Could not open %s service: %s\n", identname, winerror(GetLastError()));
-               return false;
+               goto exit;
        }
 
        if(!ControlService(service, SERVICE_CONTROL_STOP, &status)) {
@@ -745,15 +746,26 @@ static bool remove_service(void) {
 
        if(!DeleteService(service)) {
                fprintf(stderr, "Could not remove %s service: %s\n", identname, winerror(GetLastError()));
-               return false;
+               goto exit;
        }
-    if(service)
-        CloseServiceHandle(service);
-    if(manager)
-        CloseServiceHandle(manager);
-       fprintf(stderr, "%s service removed\n", identname);
 
-       return true;
+       success = true;
+
+exit:
+
+       if(service) {
+               CloseServiceHandle(service);
+       }
+
+       if(manager) {
+               CloseServiceHandle(manager);
+       }
+
+       if(success) {
+               fprintf(stderr, "%s service removed\n", identname);
+       }
+
+       return success;
 }
 #endif