3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-27 15:01:03 +08:00
Code Issues Projects Releases Wiki Activity

Fix handles leak in CGI

Browse Source 
PUBLISHED_FROM=6052b7bfec6af33328cbe369da60e9672ebac437
This commit is contained in:
Alexander Alashkin 2016-09-23 15:52:05 +01:00 committed by Cesanta Bot
parent 6c99691d1c
commit 2e748fdbf1
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mongoose.c
View File

@ -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 */