[PATCH] start_command: close cmd->err descriptor when fork/spawn fails
- From
- bert Dvornik <dvornik+git@gmail.com>
- Date
- Apr 26, 2010, 01:15 UTC
- Message-ID
- <1272244540-5960-1-git-send-email-dvornik+git@gmail.com>
Fix the problem where the cmd->err passed into start_command wasn't being properly closed when certain types of errors occurr. (Compare the affected code with the clean shutdown code later in the function.)
On Windows, this problem would be triggered if mingw_spawnvpe() failed, which would happen if the command to be executed was malformed (e.g. a text file that didn't start with a #! line). If cmd->err was a pipe, the failure to close it could result in a hang while the other side was waiting (forever) for either input or pipe close, e.g. while trying to shove the output into the side band. On msysGit, this problem was causing a hang in t5516-fetch-push.
I'm not sure why (or if) this problem hasn't cropped up under Linux. The non-Windows code *does* try to check for execve() failures in the child, in addition to the fork() failures.
Signed-off-by: bert Dvornik <dvornik+git@gmail.com> --- run-command.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/run-command.c b/run-command.c index d1a8ceb..41666ac 100644 --- a/run-command.c +++ b/run-command.c @@ -383,6 +383,8 @@ fail_pipe: close(cmd->out); if (need_err) close_pair(fderr); + else if (cmd->err) + close(cmd->err); errno = failed_errno; return -1; }
-- 1.7.1.rc1.1794.g4bea1