From 2e748fdbf129de08255ae07671d235efc466b58c Mon Sep 17 00:00:00 2001
From: Alexander Alashkin <alexander.alashkin@cesanta.com>
Date: Fri, 23 Sep 2016 15:52:05 +0100
Subject: [PATCH] Fix handles leak in CGI
PUBLISHED_FROM=6052b7bfec6af33328cbe369da60e9672ebac437
---
mongoose.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/mongoose.c b/mongoose.c
index d4167f8f9..a0d34bc2a 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -6676,9 +6676,9 @@ static void mg_abs_path(const char *utf8_path, char *abs_path, size_t len) {
WideCharToMultiByte(CP_UTF8, 0, buf2, wcslen(buf2) + 1, abs_path, len, 0, 0);
}
-static pid_t mg_start_process(const char *interp, const char *cmd,
- const char *env, const char *envp[],
- const char *dir, sock_t sock) {
+static int mg_start_process(const char *interp, const char *cmd,
+ const char *env, const char *envp[],
+ const char *dir, sock_t sock) {
STARTUPINFOW si;
PROCESS_INFORMATION pi;
HANDLE a[2], b[2], me = GetCurrentProcess();
@@ -6733,6 +6733,12 @@ static pid_t mg_start_process(const char *interp, const char *cmd,
(void *) env, full_dir, &si, &pi) != 0) {
mg_spawn_stdio_thread(sock, a[1], mg_push_to_stdin);
mg_spawn_stdio_thread(sock, b[0], mg_pull_from_stdout);
+
+ CloseHandle(si.hStdOutput);
+ CloseHandle(si.hStdInput);
+
+ CloseHandle(pi.hThread);
+ CloseHandle(pi.hProcess);
} else {
CloseHandle(a[1]);
CloseHandle(b[0]);
@@ -6741,19 +6747,13 @@ static pid_t mg_start_process(const char *interp, const char *cmd,
DBG(("CGI command: [%ls] -> %p", wcmd, pi.hProcess));
/* Not closing a[0] and b[1] because we've used DUPLICATE_CLOSE_SOURCE */
- CloseHandle(si.hStdOutput);
- CloseHandle(si.hStdInput);
- /* TODO(lsm): check if we need close process and thread handles too */
- /* CloseHandle(pi.hThread); */
- /* CloseHandle(pi.hProcess); */
-
(void) envp;
- return pi.hProcess;
+ return (pi.hProcess != NULL);
}
#else
-static pid_t mg_start_process(const char *interp, const char *cmd,
- const char *env, const char *envp[],
- const char *dir, sock_t sock) {
+static int mg_start_process(const char *interp, const char *cmd,
+ const char *env, const char *envp[],
+ const char *dir, sock_t sock) {
char buf[500];
pid_t pid = fork();
(void) env;
@@ -6791,7 +6791,7 @@ static pid_t mg_start_process(const char *interp, const char *cmd,
exit(EXIT_FAILURE); /* exec call failed */
}
- return pid;
+ return (pid != 0);
}
#endif /* _WIN32 */
--
GitLab