http: avoid closing index-pack input twice

finish_http_pack_request() passes its staging-file descriptor to
index-pack through child_process.in. start_command() takes ownership
of a supplied descriptor and closes it, even when starting the child
fails.

Do not close the descriptor again after run_command() returns.

Signed-off-by: Ted Nyman <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/http.c b/http.c
index b4e7b8d00b3cdc2b9289f7cc47db8403e1057ab4..930e0d227fda73073305c6fb30a59fb9df2235ae 100644 (file)
--- a/http.c
+++ b/http.c
@@ -2704,13 +2704,8 @@ int finish_http_pack_request(struct http_pack_request *preq)
        else
                ip.no_stdout = 1;
 
-       if (run_command(&ip)) {
+       if (run_command(&ip))
                ret = -1;
-               goto cleanup;
-       }
-
-cleanup:
-       close(tmpfile_fd);
        unlink(preq->tmpfile.buf);
        return ret;
 }