mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 23:26:09 +02:00
Code

Merge branch 'sb/plug-misc-leaks' 

Misc leak plugging.

* sb/plug-misc-leaks:
  sequencer.c: plug mem leak in git_sequencer_config
  sequencer.c: plug leaks in do_pick_commit
  submodule--helper: plug mem leak in print_default_remote
  refs/packed-backend.c: close fd of empty file
This commit is contained in:
Junio C Hamano 2018-06-25 13:22:41 -07:00
parent 90fa1c5d6c f40f3c16cd
commit 02f27d0dd0
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/submodule--helper.c
View File

@ -55,7 +55,7 @@ static char *get_default_remote(void)
static int print_default_remote(int argc, const char **argv, const char *prefix)
{
const char *remote;
char *remote;
if (argc != 1)
die(_("submodule--helper print-default-remote takes no arguments"));
@ -64,6 +64,7 @@ static int print_default_remote(int argc, const char **argv, const char *prefix)
if (remote)
printf("%s\n", remote);
free(remote);
return 0;
}

1
refs/packed-backend.c
View File

@ -499,6 +499,7 @@ static int load_contents(struct snapshot *snapshot)
size = xsize_t(st.st_size);
if (!size) {
close(fd);
return 0;
} else if (mmap_strategy == MMAP_NONE || size <= SMALL_FILE_SIZE) {
snapshot->buf = xmalloc(size);

4
sequencer.c
View File

@ -176,6 +176,7 @@ static int git_sequencer_config(const char *k, const char *v, void *cb)
warning(_("invalid commit message cleanup mode '%s'"),
s);
free((char *)s);
return status;
}
@ -1774,7 +1775,8 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
res = do_recursive_merge(base, next, base_label, next_label,
&head, &msgbuf, opts);
if (res < 0)
return res;
goto leave;
res |= write_message(msgbuf.buf, msgbuf.len,
git_path_merge_msg(), 0);
} else {