receive-pack: avoid minor leak in case start_async() fails

PATCH New René Scharfe 1 participant 1 message Jun 15, 2016

Share & tools

René Scharfe

author

2016-06-15 23:02 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 builtin/receive-pack.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

builtin/receive-pack.c +2 -2

index fc03937..32fc540 100644
@@ -527,8 +527,6 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta
 	proc.in = -1;
 	proc.stdout_to_stderr = 1;
 
-	prepare_push_cert_sha1(&proc);
-
 	if (use_sideband) {
 		memset(&muxer, 0, sizeof(muxer));
 		muxer.proc = copy_to_sideband;

@@ -539,6 +537,8 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta
 		proc.err = muxer.in;
 	}
 
+	prepare_push_cert_sha1(&proc);
+
 	code = start_command(&proc);
 	if (code) {
 		if (use_sideband)

Signature · 1 line

2.1.2