From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Nov 2015 23:13:11 +0000 (-0800)
Subject: Merge branch 'rs/daemon-plug-child-leak'
X-Git-Tag: v2.7.0-rc0~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3c592ef95ee21833e2214fb9068889dcac220c9;p=thirdparty%2Fgit.git

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

"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()
---

c3c592ef95ee21833e2214fb9068889dcac220c9
diff --cc run-command.c
index e17e456cda,fc391fb9cd..13fa452e8c
--- 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;
  }