Prevent buffer overrun in log_event().

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index fbcc369..7eb6112 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -219,7 +219,27 @@ int get_number(HKEY key, char *value, unsigned long *number) {
   return get_number(key, value, number, true);\r
 }\r
 \r
-int get_parameters(char *service_name, char *exe, unsigned long exelen, char *flags, unsigned long flagslen, char *dir, unsigned long dirlen, char **env, unsigned long *throttle_delay, unsigned long *stop_method, STARTUPINFO *si) {\r
+void override_milliseconds(char *service_name, HKEY key, char *value, unsigned long *buffer, unsigned long default_value, unsigned long event) {\r
+  unsigned long type = REG_DWORD;\r
+  unsigned long buflen = sizeof(unsigned long);\r
+  bool ok = false;\r
+  unsigned long ret = RegQueryValueEx(key, value, 0, &type, (unsigned char *) buffer, &buflen);\r
+  if (ret != ERROR_SUCCESS) {\r
+    if (ret != ERROR_FILE_NOT_FOUND) {\r
+      if (type != REG_DWORD) {\r
+        char milliseconds[16];\r
+        _snprintf_s(milliseconds, sizeof(milliseconds), _TRUNCATE, "%lu", default_value);\r
+        log_event(EVENTLOG_WARNING_TYPE, event, service_name, value, milliseconds, 0);\r
+      }\r
+      else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);\r
+    }\r
+  }\r
+  else ok = true;\r
+\r
+  if (! ok) *buffer = default_value;\r
+}\r
+\r
+int get_parameters(char *service_name, char *exe, unsigned long exelen, char *flags, unsigned long flagslen, char *dir, unsigned long dirlen, char **env, unsigned long *throttle_delay, unsigned long *stop_method, unsigned long *kill_console_delay, unsigned long *kill_window_delay, unsigned long *kill_threads_delay, STARTUPINFO *si) {\r
   unsigned long ret;\r
 \r
   /* Get registry */\r
@@ -280,28 +300,12 @@ int get_parameters(char *service_name, char *exe, unsigned long exelen, char *fl
   }\r
 \r
   /* Try to get throttle restart delay */\r
-  unsigned long type = REG_DWORD;\r
-  unsigned long buflen = sizeof(*throttle_delay);\r
-  bool throttle_ok = false;\r
-  ret = RegQueryValueEx(key, NSSM_REG_THROTTLE, 0, &type, (unsigned char *) throttle_delay, &buflen);\r
-  if (ret != ERROR_SUCCESS) {\r
-    if (ret != ERROR_FILE_NOT_FOUND) {\r
-      if (type != REG_DWORD) {\r
-        char milliseconds[16];\r
-        _snprintf_s(milliseconds, sizeof(milliseconds), _TRUNCATE, "%lu", NSSM_RESET_THROTTLE_RESTART);\r
-        log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_BOGUS_THROTTLE, service_name, NSSM_REG_THROTTLE, milliseconds, 0);\r
-      }\r
-      else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_THROTTLE, error_string(GetLastError()), 0);\r
-    }\r
-  }\r
-  else throttle_ok = true;\r
-\r
-  if (! throttle_ok) *throttle_delay = NSSM_RESET_THROTTLE_RESTART;\r
+  override_milliseconds(service_name, key, NSSM_REG_THROTTLE, throttle_delay, NSSM_RESET_THROTTLE_RESTART, NSSM_EVENT_BOGUS_THROTTLE);\r
 \r
   /* Try to get service stop flags. */\r
-  type = REG_DWORD;\r
+  unsigned long type = REG_DWORD;\r
   unsigned long stop_method_skip;\r
-  buflen = sizeof(stop_method_skip);\r
+  unsigned long buflen = sizeof(stop_method_skip);\r
   bool stop_ok = false;\r
   ret = RegQueryValueEx(key, NSSM_REG_STOP_METHOD_SKIP, 0, &type, (unsigned char *) &stop_method_skip, &buflen);\r
   if (ret != ERROR_SUCCESS) {\r
@@ -318,6 +322,11 @@ int get_parameters(char *service_name, char *exe, unsigned long exelen, char *fl
   *stop_method = ~0;\r
   if (stop_ok) *stop_method &= ~stop_method_skip;\r
 \r
+  /* Try to get kill delays - may fail. */\r
+  override_milliseconds(service_name, key, NSSM_REG_KILL_CONSOLE_GRACE_PERIOD, kill_console_delay, NSSM_KILL_CONSOLE_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_CONSOLE_GRACE_PERIOD);\r
+  override_milliseconds(service_name, key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD, kill_window_delay, NSSM_KILL_WINDOW_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_WINDOW_GRACE_PERIOD);\r
+  override_milliseconds(service_name, key, NSSM_REG_KILL_THREADS_GRACE_PERIOD, kill_threads_delay, NSSM_KILL_THREADS_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_THREADS_GRACE_PERIOD);\r
+\r
   /* Close registry */\r
   RegCloseKey(key);\r
 \r