Skip to content

Commit

Permalink
gpg: close stderr once finished with it in verify_signed_buffer()
Browse files Browse the repository at this point in the history
Failing to close the stderr pipe in verify_signed_buffer() causes
git to run out of file descriptors if there are many calls to
verify_signed_buffer(). An easy way to trigger this is to run

 git log --show-signature --merges | grep "key"

on the linux kernel git repo. Eventually it will fail with

 error: cannot create pipe for gpg: Too many open files
 error: could not run gpg.

Close the stderr pipe so that this can't happen.

Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Stephen Boyd authored and Junio C Hamano committed Jan 31, 2013
1 parent 2f47eae commit 7dac3f8
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion gpg-interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,10 @@ int verify_signed_buffer(const char *payload, size_t payload_size,
write_in_full(gpg.in, payload, payload_size);
close(gpg.in);

if (gpg_output)
if (gpg_output) {
strbuf_read(gpg_output, gpg.err, 0);
close(gpg.err);
}
ret = finish_command(&gpg);

unlink_or_warn(path);
Expand Down

0 comments on commit 7dac3f8

Please sign in to comment.