From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Nov 2015 20:18:16 +0000 (-0800)
Subject: Merge branch 'rs/daemon-plug-child-leak' into maint
X-Git-Tag: v2.6.3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b8f5242592146c85c2e09fd9721e522ce4dd32e5

Merge branch 'rs/daemon-plug-child-leak' into maint

"git daemon" uses "run_command()" without "finish_command()", so it
needs to release resources itself, which it forgot to do.

* rs/daemon-plug-child-leak:
daemon: plug memory leak
run-command: factor out child_process_clear()
---

b8f5242592146c85c2e09fd9721e522ce4dd32e5
diff --cc run-command.c
index e09275bd9e,fc391fb9cd..84e4ce66e9
--- a/run-command.c
+++ b/run-command.c
@@@ -539,9 -553,8 +543,8 @@@ fail_pipe
  
  int finish_command(struct child_process *cmd)
  {
 -	int ret = wait_or_whine(cmd->pid, cmd->argv[0]);
 +	int ret = wait_or_whine(cmd->pid, cmd->argv[0], 0);
- 	argv_array_clear(&cmd->args);
- 	argv_array_clear(&cmd->env_array);
+ 	child_process_clear(cmd);
  	return ret;
  }