X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=bc3a4711c8364f98d3aea9c011ac39aa4e36d3c4;hb=4f7514a8b856d31e1f26984e54bb5e27d475f71a;hp=b3b0c628559eb17907539aac57a5e9292f0a6dd5;hpb=1f0b03b38f7d76814d1c7c627f64462362100223;p=nssm.git

diff --git a/service.cpp b/service.cpp
index b3b0c62..bc3a471 100644
--- a/service.cpp
+++ b/service.cpp
@@ -653,8 +653,6 @@ int get_service_description(const TCHAR *service_name, SC_HANDLE service_handle,
     print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service_name, _T("SERVICE_CONFIG_DESCRIPTION"), error_string(error));
     return 4;
   }
-
-  return 0;
 }
 
 int get_service_startup(const TCHAR *service_name, SC_HANDLE service_handle, const QUERY_SERVICE_CONFIG *qsc, unsigned long *startup) {
@@ -762,7 +760,7 @@ void cleanup_nssm_service(nssm_service_t *service) {
   if (! service) return;
   if (service->username) HeapFree(GetProcessHeap(), 0, service->username);
   if (service->password) {
-    SecureZeroMemory(service->password, service->passwordlen);
+    SecureZeroMemory(service->password, service->passwordlen * sizeof(TCHAR));
     HeapFree(GetProcessHeap(), 0, service->password);
   }
   if (service->dependencies) HeapFree(GetProcessHeap(), 0, service->dependencies);
@@ -1982,7 +1980,6 @@ void CALLBACK end_service(void *arg, unsigned char why) {
       wait_for_hooks(service, false);
       free_imports();
       exit(exitcode);
-    break;
   }
 }