summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-11-03 15:13:11 -0800
committerJunio C Hamano <gitster@pobox.com>2015-11-03 15:13:12 -0800
commitc3c592ef95ee21833e2214fb9068889dcac220c9 (patch)
tree6772b21ff5964ab2227d5c7acb4246eaa9729152 /daemon.c
parent6784eb5ad93da15d24a5d111a3d6df618f98532f (diff)
parentb1b49ff8d42a21ade6a72b40a147fd3eaff3db8d (diff)
downloadgit-c3c592ef95ee21833e2214fb9068889dcac220c9.tar.gz
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()
Diffstat (limited to 'daemon.c')
-rw-r--r--daemon.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/daemon.c b/daemon.c
index 56679a15fe..be70cd4da0 100644
--- a/daemon.c
+++ b/daemon.c
@@ -802,6 +802,7 @@ static void check_dead_children(void)
/* remove the child */
*cradle = blanket->next;
live_children--;
+ child_process_clear(&blanket->cld);
free(blanket);
} else
cradle = &blanket->next;