mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
"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()
This commit is contained in:
Junio C Hamano
2015-11-03 15:13:11 -08:00
parent 6784eb5ad9 b1b49ff8d4
commit c3c592ef95
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
run-command.c
View File

@ -11,6 +11,12 @@ void child_process_init(struct child_process *child)
argv_array_init(&child->env_array);
}
void child_process_clear(struct child_process *child)
{
argv_array_clear(&child->args);
argv_array_clear(&child->env_array);
}
struct child_to_clean {
pid_t pid;
struct child_to_clean *next;
@ -327,8 +333,7 @@ int start_command(struct child_process *cmd)
fail_pipe:
error("cannot create %s pipe for %s: %s",
str, cmd->argv[0], strerror(failed_errno));
argv_array_clear(&cmd->args);
argv_array_clear(&cmd->env_array);
child_process_clear(cmd);
errno = failed_errno;
return -1;
}
@ -513,8 +518,7 @@ fail_pipe:
close_pair(fderr);
else if (cmd->err)
close(cmd->err);
argv_array_clear(&cmd->args);
argv_array_clear(&cmd->env_array);
child_process_clear(cmd);
errno = failed_errno;
return -1;
}
@ -540,8 +544,7 @@ fail_pipe:
int finish_command(struct child_process *cmd)
{
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;
}