summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-11-05 12:18:16 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-11-05 12:18:17 -0800
commitb8f5242592146c85c2e09fd9721e522ce4dd32e5 (patch)
treeef6940721a58a3b0c747a4e756dfc80e8a48756a /daemon.c
parentMerge branch 'rs/wt-status-detached-branch-fix' into maint (diff)
parentdaemon: plug memory leak (diff)
downloadtgif-b8f5242592146c85c2e09fd9721e522ce4dd32e5.tar.xz
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()
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 f9eb296888..77a2f03865 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;