\r
void set_service_environment(nssm_service_t *service) {\r
if (! service) return;\r
- if (service->env) duplicate_environment(service->env);\r
- if (service->env_extra) set_environment_block(service->env_extra);\r
+\r
+ /*\r
+ We have to duplicate the block because this function will be called\r
+ multiple times between registry reads.\r
+ */\r
+ if (service->env) duplicate_environment_strings(service->env);\r
+ if (! service->env_extra) return;\r
+ TCHAR *env_extra = copy_environment_block(service->env_extra);\r
+ if (! env_extra) return;\r
+\r
+ set_environment_block(env_extra);\r
+ HeapFree(GetProcessHeap(), 0, env_extra);\r
}\r
\r
void unset_service_environment(nssm_service_t *service) {\r
return stop_service(service, 4, true, true);\r
}\r
\r
+ /* The pre-start hook will have cleaned the environment. */\r
+ set_service_environment(service);\r
+\r
bool inherit_handles = false;\r
if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;\r
unsigned long flags = service->priority & priority_mask();\r