Store I/O redirection and environment options.

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index 75d48c7..09ad1cb 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -357,36 +357,38 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
   /* Environment variables to add to existing rather than replace - may fail. */\r
   set_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);\r
 \r
-  if (service->env_extra) {\r
-    /* Append these to any other environment variables set. */\r
-    if (service->env) {\r
-      /* Append extra variables to configured variables. */\r
-      unsigned long envlen = service->envlen + service->env_extralen - 1;\r
-      TCHAR *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen);\r
-      if (env) {\r
-        memmove(env, service->env, service->envlen - sizeof(TCHAR));\r
-        /* envlen is in bytes. */\r
-        memmove(env + (service->envlen / sizeof(TCHAR)) - 1, service->env_extra, service->env_extralen);\r
-\r
-        HeapFree(GetProcessHeap(), 0, service->env);\r
-        service->env = env;\r
-        service->envlen = envlen;\r
+  if (si) {\r
+    if (service->env_extra) {\r
+      /* Append these to any other environment variables set. */\r
+      if (service->env) {\r
+        /* Append extra variables to configured variables. */\r
+        unsigned long envlen = service->envlen + service->env_extralen - 1;\r
+        TCHAR *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen);\r
+        if (env) {\r
+          memmove(env, service->env, service->envlen - sizeof(TCHAR));\r
+          /* envlen is in bytes. */\r
+          memmove(env + (service->envlen / sizeof(TCHAR)) - 1, service->env_extra, service->env_extralen);\r
+\r
+          HeapFree(GetProcessHeap(), 0, service->env);\r
+          service->env = env;\r
+          service->envlen = envlen;\r
+        }\r
+        else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("get_parameters()"), 0);\r
       }\r
-      else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("get_parameters()"), 0);\r
-    }\r
-    else {\r
-      /* Append extra variables to our environment. */\r
-      TCHAR *env, *s;\r
-      size_t envlen, len;\r
-\r
-      env = service->env_extra;\r
-      len = 0;\r
-      while (*env) {\r
-        envlen = _tcslen(env) + 1;\r
-        for (s = env; *s && *s != _T('='); s++);\r
-        if (*s == _T('=')) *s++ = _T('\0');\r
-        if (! SetEnvironmentVariable(env, s)) log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_SETENVIRONMENTVARIABLE_FAILED, env, s, error_string(GetLastError()), 0);\r
-        env += envlen;\r
+      else {\r
+        /* Append extra variables to our environment. */\r
+        TCHAR *env, *s;\r
+        size_t envlen, len;\r
+\r
+        env = service->env_extra;\r
+        len = 0;\r
+        while (*env) {\r
+          envlen = _tcslen(env) + 1;\r
+          for (s = env; *s && *s != _T('='); s++);\r
+          if (*s == _T('=')) *s++ = _T('\0');\r
+          if (! SetEnvironmentVariable(env, s)) log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_SETENVIRONMENTVARIABLE_FAILED, env, s, error_string(GetLastError()), 0);\r
+          env += envlen;\r
+        }\r
       }\r
     }\r
   }\r