X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=b24eae2a4a7a5b4565a461e23693703c685e6766;hb=095331018c46d251f6db151572bb1c2e76e911fa;hp=6a3907e59dce7275502a9a88db31614d2ecdd71f;hpb=fb96938cf944edf3bc0dfd99dbff416b0397df4f;p=nssm.git

diff --git a/service.cpp b/service.cpp
index 6a3907e..b24eae2 100644
--- a/service.cpp
+++ b/service.cpp
@@ -774,7 +774,7 @@ void cleanup_nssm_service(nssm_service_t *service) {
   if (service->throttle_section_initialised) DeleteCriticalSection(&service->throttle_section);
   if (service->throttle_timer) CloseHandle(service->throttle_timer);
   if (service->hook_section_initialised) DeleteCriticalSection(&service->hook_section);
-  if (service->initial_env) FreeEnvironmentStrings(service->initial_env);
+  if (service->initial_env) HeapFree(GetProcessHeap(), 0, service->initial_env);
   HeapFree(GetProcessHeap(), 0, service);
 }
 
@@ -1479,7 +1479,7 @@ void WINAPI service_main(unsigned long argc, TCHAR **argv) {
   service->hook_section_initialised = true;
 
   /* Remember our initial environment. */
-  service->initial_env = GetEnvironmentStrings();
+  service->initial_env = copy_environment();
 
   /* Remember our creation time. */
   if (get_process_creation_time(GetCurrentProcess(), &service->nssm_creation_time)) ZeroMemory(&service->nssm_creation_time, sizeof(service->nssm_creation_time));