Fixing SIGCHLD logic in sftp and removing double close in SIGCHLD imp…

…lementation
PowerShell · Apr 6, 2016 · a9a683e · a9a683e
1 parent 6ec6275
commit a9a683e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/contrib/win32/win32compat/signal_sigchld.c b/contrib/win32/win32compat/signal_sigchld.c
@@ -192,7 +192,7 @@ int waitpid(int pid, int *status, int options) {
 
 		ret_id = children.process_id[index];
 		GetExitCodeProcess(process, &exit_code);
-		CloseHandle(process);
+		/* process handle will be closed when its removed from list */
 		sw_remove_child_at_index(index);
 		if (status)
 			*status = exit_code;

diff --git a/sftp.c b/sftp.c
@@ -2251,8 +2251,8 @@ connect_to_server(char *path, char **args, int *in, int *out)
 			NORMAL_PRIORITY_CLASS, NULL,
 			NULL, &si, &pi) == TRUE) {
 			sshpid = pi.dwProcessId;
-			CloseHandle(pi.hProcess);
 			CloseHandle(pi.hThread);
+			sw_add_child(pi.hProcess, pi.dwProcessId);
 		}
 		else
 			errno = GetLastError();