Thread safety.

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index 0a74bd8..15ee152 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -10,7 +10,7 @@ int create_messages() {
   }\r
 \r
   if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, registry, 0, 0, REG_OPTION_NON_VOLATILE, KEY_WRITE, 0, &key, 0) != ERROR_SUCCESS) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, GetLastError(), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);\r
     return 2;\r
   }\r
 \r
@@ -37,25 +37,25 @@ int create_parameters(char *service_name, char *exe, char *flags, char *dir) {
   /* Try to open the registry */\r
   HKEY key;\r
   if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, registry, 0, 0, REG_OPTION_NON_VOLATILE, KEY_WRITE, 0, &key, 0) != ERROR_SUCCESS) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, GetLastError(), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);\r
     return 2;\r
   }\r
 \r
   /* Try to create the parameters */\r
   if (RegSetValueEx(key, NSSM_REG_EXE, 0, REG_EXPAND_SZ, (const unsigned char *) exe, strlen(exe) + 1) != ERROR_SUCCESS) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_EXE, GetLastError(), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_EXE, error_string(GetLastError()), 0);\r
     RegDeleteKey(HKEY_LOCAL_MACHINE, NSSM_REGISTRY);\r
     RegCloseKey(key);\r
     return 3;\r
   }\r
   if (RegSetValueEx(key, NSSM_REG_FLAGS, 0, REG_EXPAND_SZ, (const unsigned char *) flags, strlen(flags) + 1) != ERROR_SUCCESS) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_FLAGS, GetLastError(), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_FLAGS, error_string(GetLastError()), 0);\r
     RegDeleteKey(HKEY_LOCAL_MACHINE, NSSM_REGISTRY);\r
     RegCloseKey(key);\r
     return 4;\r
   }\r
   if (RegSetValueEx(key, NSSM_REG_DIR, 0, REG_EXPAND_SZ, (const unsigned char *) dir, strlen(dir) + 1) != ERROR_SUCCESS) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_DIR, GetLastError(), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_DIR, error_string(GetLastError()), 0);\r
     RegDeleteKey(HKEY_LOCAL_MACHINE, NSSM_REGISTRY);\r
     RegCloseKey(key);\r
     return 5;\r
@@ -79,7 +79,7 @@ int create_exit_action(char *service_name, const char *action_string) {
   HKEY key;\r
   unsigned long disposition;\r
   if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, registry, 0, 0, REG_OPTION_NON_VOLATILE, KEY_WRITE, 0, &key, &disposition) != ERROR_SUCCESS) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, GetLastError(), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);\r
     return 2;\r
   }\r
 \r
@@ -91,7 +91,7 @@ int create_exit_action(char *service_name, const char *action_string) {
 \r
   /* Create the default value */\r
   if (RegSetValueEx(key, 0, 0, REG_SZ, (const unsigned char *) action_string, strlen(action_string) + 1) != ERROR_SUCCESS) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_EXIT, GetLastError(), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_EXIT, error_string(GetLastError()), 0);\r
     RegCloseKey(key);\r
     return 3;\r
   }\r
@@ -102,7 +102,7 @@ int create_exit_action(char *service_name, const char *action_string) {
   return 0;\r
 }\r
 \r
-int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen) {\r
+int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, bool sanitise) {\r
   unsigned char *buffer = (unsigned char *) HeapAlloc(GetProcessHeap(), 0, datalen);\r
   if (! buffer) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, "expand_parameter()", 0);\r
@@ -114,11 +114,14 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen) {
 \r
   unsigned long ret = RegQueryValueEx(key, value, 0, &type, buffer, &buflen);\r
   if (ret != ERROR_SUCCESS) {\r
-    if (ret != ERROR_FILE_NOT_FOUND) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, GetLastError(), 0);\r
+    if (ret != ERROR_FILE_NOT_FOUND) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);\r
     HeapFree(GetProcessHeap(), 0, buffer);\r
     return 2;\r
   }\r
 \r
+  /* Paths aren't allowed to contain quotes. */\r
+  if (sanitise) PathUnquoteSpaces((LPSTR) buffer);\r
+\r
   ZeroMemory(data, datalen);\r
 \r
   /* Technically we shouldn't expand environment strings from REG_SZ values */\r
@@ -130,7 +133,7 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen) {
 \r
   ret = ExpandEnvironmentStrings((char *) buffer, data, datalen);\r
   if (! ret || ret > datalen) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_EXPANDENVIRONMENTSTRINGS_FAILED, value, buffer, GetLastError(), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_EXPANDENVIRONMENTSTRINGS_FAILED, value, buffer, error_string(GetLastError()), 0);\r
     HeapFree(GetProcessHeap(), 0, buffer);\r
     return 3;\r
   }\r
@@ -150,24 +153,24 @@ int get_parameters(char *service_name, char *exe, int exelen, char *flags, int f
   /* Try to open the registry */\r
   HKEY key;\r
   if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, registry, 0, KEY_READ, &key) != ERROR_SUCCESS) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, GetLastError(), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);\r
     return 2;\r
   }\r
 \r
   /* Try to get executable file - MUST succeed */\r
-  if (expand_parameter(key, NSSM_REG_EXE, exe, exelen)) {\r
+  if (expand_parameter(key, NSSM_REG_EXE, exe, exelen, false)) {\r
     RegCloseKey(key);\r
     return 3;\r
   }\r
 \r
   /* Try to get flags - may fail and we don't care */\r
-  if (expand_parameter(key, NSSM_REG_FLAGS, flags, flagslen)) {\r
+  if (expand_parameter(key, NSSM_REG_FLAGS, flags, flagslen, false)) {\r
     log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_NO_FLAGS, NSSM_REG_FLAGS, service_name, exe, 0);\r
     ZeroMemory(flags, flagslen);\r
   }\r
 \r
   /* Try to get startup directory - may fail and we fall back to a default */\r
-  if (expand_parameter(key, NSSM_REG_DIR, dir, dirlen) || ! dir[0]) {\r
+  if (expand_parameter(key, NSSM_REG_DIR, dir, dirlen, true) || ! dir[0]) {\r
     /* Our buffers are defined to be long enough for this to be safe */\r
     size_t i;\r
     for (i = strlen(exe); i && exe[i] != '\\' && exe[i] != '/'; i--);\r
@@ -177,7 +180,7 @@ int get_parameters(char *service_name, char *exe, int exelen, char *flags, int f
     }\r
     else {\r
       /* Help! */\r
-      unsigned long ret = ExpandEnvironmentStrings("%SYSTEMROOT%", dir, dirlen);\r
+      unsigned long ret = GetWindowsDirectory(dir, dirlen);\r
       if (! ret || ret > dirlen) {\r
         log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_NO_DIR_AND_NO_FALLBACK, NSSM_REG_DIR, service_name, 0);\r
         RegCloseKey(key);\r
@@ -208,7 +211,7 @@ int get_exit_action(char *service_name, unsigned long *ret, unsigned char *actio
   HKEY key;\r
   long error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, registry, 0, KEY_READ, &key);\r
   if (error != ERROR_SUCCESS && error != ERROR_FILE_NOT_FOUND) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, GetLastError(), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);\r
     return 2;\r
   }\r
 \r