Allow adding or removing individual environment variables.

[nssm.git] / service.cpp

diff --git a/service.cpp b/service.cpp
index 164fbc0..91435db 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -562,8 +562,10 @@ int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle
   QUERY_SERVICE_CONFIG *qsc = query_service_config(service_name, service_handle);\r
   if (! qsc) return 3;\r
 \r
-  if (! qsc->lpDependencies) return 0;\r
-  if (! qsc->lpDependencies[0]) return 0;\r
+  if (! qsc->lpDependencies || ! qsc->lpDependencies[0]) {\r
+    HeapFree(GetProcessHeap(), 0, qsc);\r
+    return 0;\r
+  }\r
 \r
   /* lpDependencies is doubly NULL terminated. */\r
   while (qsc->lpDependencies[*bufsize]) {\r
@@ -577,6 +579,7 @@ int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle
   if (! *buffer) {\r
     *bufsize = 0;\r
     print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("lpDependencies"), _T("get_service_dependencies()"));\r
+    HeapFree(GetProcessHeap(), 0, qsc);\r
     return 4;\r
   }\r
 \r
@@ -601,6 +604,12 @@ int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle
 \r
   HeapFree(GetProcessHeap(), 0, qsc);\r
 \r
+  if (! *buffer[0]) {\r
+    HeapFree(GetProcessHeap(), 0, *buffer);\r
+    *buffer = 0;\r
+    *bufsize = 0;\r
+  }\r
+\r
   return 0;\r
 }\r
 \r
@@ -1072,7 +1081,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   }\r
 \r
   if (! service->native) {\r
-    key = open_registry(service->name, KEY_WRITE);\r
+    key = open_registry(service->name, KEY_READ | KEY_WRITE);\r
     if (! key) {\r
       if (value.string) HeapFree(GetProcessHeap(), 0, value.string);\r
       return 4;\r