summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6456709)
Ensure we free qsc when there are no dependencies.
Ensure we free qsc when we couldn't allocate a buffer.
Free the buffer and zero its pointer's size when there are no
dependencies.
QUERY_SERVICE_CONFIG *qsc = query_service_config(service_name, service_handle);\r
if (! qsc) return 3;\r
\r
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
\r
/* lpDependencies is doubly NULL terminated. */\r
while (qsc->lpDependencies[*bufsize]) {\r
if (! *buffer) {\r
*bufsize = 0;\r
print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("lpDependencies"), _T("get_service_dependencies()"));\r
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
\r
HeapFree(GetProcessHeap(), 0, qsc);\r
\r
\r
HeapFree(GetProcessHeap(), 0, qsc);\r
\r
+ if (! *buffer[0]) {\r
+ HeapFree(GetProcessHeap(), 0, *buffer);\r
+ *buffer = 0;\r
+ *bufsize = 0;\r
+ }\r
+\r