diff options
| author | Jeff King <peff@peff.net> | 2015-03-22 23:53:52 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-22 21:39:14 -0700 |
| commit | 5c950e9bf098b17bb37e06f7c9f50d24e9d2904f (patch) | |
| tree | 5ce551fa90856f8d6c9b435ba778a1a10b8afdc2 /wt-status.c | |
| parent | 911ec99b688fc4d5673a0fc8984b22ff2251e490 (diff) | |
| download | git-5c950e9bf098b17bb37e06f7c9f50d24e9d2904f.tar.gz | |
wt-status: use capture_command
When we spawn "git submodule status" to read its output, we
use run_command() followed by strbuf_read() read from the
pipe. This can deadlock if the subprocess output is larger
than the system pipe buffer.
Furthermore, if start_command() fails, we'll try to read
from a bogus descriptor (probably "-1" or a descriptor we
just closed, but it is a bad idea for us to make assumptions
about how start_command implements its error handling). And
if start_command succeeds, we leak the file descriptor for
the pipe to the child.
All of these can be solved by using the capture_command
helper.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/wt-status.c b/wt-status.c index 05b69dc4d3..ef232a74be 100644 --- a/wt-status.c +++ b/wt-status.c @@ -744,11 +744,8 @@ static void wt_status_print_submodule_summary(struct wt_status *s, int uncommitt sm_summary.git_cmd = 1; sm_summary.no_stdin = 1; - sm_summary.out = -1; - run_command(&sm_summary); - - strbuf_read(&cmd_stdout, sm_summary.out, 1024); + capture_command(&sm_summary, &cmd_stdout, 1024); /* prepend header, only if there's an actual output */ if (cmd_stdout.len) { |