X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=6a3907e59dce7275502a9a88db31614d2ecdd71f;hb=66861c12e7d515f4d0e779102780d89e3fcd2a12;hp=f575a37284941eb98f5389c5f82d3b86e47668d0;hpb=32a1d0fab47a050086106aac346342c70f4d985b;p=nssm.git

diff --git a/service.cpp b/service.cpp
index f575a37..6a3907e 100644
--- a/service.cpp
+++ b/service.cpp
@@ -275,8 +275,18 @@ static inline unsigned long throttle_milliseconds(unsigned long throttle) {
 
 void set_service_environment(nssm_service_t *service) {
   if (! service) return;
-  if (service->env) duplicate_environment(service->env);
-  if (service->env_extra) set_environment_block(service->env_extra);
+
+  /*
+    We have to duplicate the block because this function will be called
+    multiple times between registry reads.
+  */
+  if (service->env) duplicate_environment_strings(service->env);
+  if (! service->env_extra) return;
+  TCHAR *env_extra = copy_environment_block(service->env_extra);
+  if (! env_extra) return;
+
+  set_environment_block(env_extra);
+  HeapFree(GetProcessHeap(), 0, env_extra);
 }
 
 void unset_service_environment(nssm_service_t *service) {
@@ -1116,7 +1126,7 @@ int install_service(nssm_service_t *service) {
   }
 
   /* Get path of this program */
-  GetModuleFileName(0, service->image, _countof(service->image));
+  _sntprintf_s(service->image, _countof(service->image), _TRUNCATE, _T("%s"), nssm_imagepath());
 
   /* Create the service - settings will be changed in edit_service() */
   service->handle = CreateService(services, service->name, service->name, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, service->image, 0, 0, 0, 0, 0);
@@ -1734,6 +1744,9 @@ int start_service(nssm_service_t *service) {
       return stop_service(service, 4, true, true);
     }
 
+    /* The pre-start hook will have cleaned the environment. */
+    set_service_environment(service);
+
     bool inherit_handles = false;
     if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;
     unsigned long flags = service->priority & priority_mask();