receive-pack: avoid minor leak in case start_async() fails
If the asynchronous start of copy_to_sideband() fails, then any env_array entries added to struct child_process proc by prepare_push_cert_sha1() are leaked. Call the latter function only after start_async() succeeded so that the allocated entries are cleaned up automatically by start_command() or finish_command(). Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Oct 28, 2014 at 21:27 UTC
5d222c099e38bcf329af544ec42ad3dd0644741c
1 file changed
+2
-2
builtin/receive-pack.c
+2
-2
@@ -521,8 +521,6 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta
521
proc.in = -1;
522
proc.stdout_to_stderr = 1;
523
524
- prepare_push_cert_sha1(&proc);
525
-
524
if (use_sideband) {
525
memset(&muxer, 0, sizeof(muxer));
526
muxer.proc = copy_to_sideband;
@@ -533,6 +531,8 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta
531
proc.err = muxer.in;
532
}
533
534
+ prepare_push_cert_sha1(&proc);
535
+
536
code = start_command(&proc);
537
if (code) {
538
if (use_sideband)