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

Merge branch 'pw/add-p-leakfix'

Browse Source 
Leakfix.

* pw/add-p-leakfix:
  add -p: fix memory leak
This commit is contained in:
Junio C Hamano
2020-09-18 17:58:03 -07:00
parent e96b271d18 324efcf6b6
commit 3ad8d3e4f9
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
add-patch.c
View File

@ -266,6 +266,20 @@ struct add_p_state {
const char *revision; const char *revision;
}; };
static void add_p_state_clear(struct add_p_state *s)
{
size_t i;
strbuf_release(&s->answer);
strbuf_release(&s->buf);
strbuf_release(&s->plain);
strbuf_release(&s->colored);
for (i = 0; i < s->file_diff_nr; i++)
free(s->file_diff[i].hunk);
free(s->file_diff);
clear_add_i_state(&s->s);
}
static void err(struct add_p_state *s, const char *fmt, ...) static void err(struct add_p_state *s, const char *fmt, ...)
{ {
va_list args; va_list args;
@ -1690,9 +1704,7 @@ int run_add_p(struct repository *r, enum add_p_mode mode,
repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1, repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
NULL, NULL, NULL) < 0) || NULL, NULL, NULL) < 0) ||
parse_diff(&s, ps) < 0) { parse_diff(&s, ps) < 0) {
strbuf_release(&s.plain); add_p_state_clear(&s);
strbuf_release(&s.colored);
clear_add_i_state(&s.s);
return -1; return -1;
} }
@ -1707,10 +1719,6 @@ int run_add_p(struct repository *r, enum add_p_mode mode,
else if (binary_count == s.file_diff_nr) else if (binary_count == s.file_diff_nr)
fprintf(stderr, _("Only binary files changed.\n")); fprintf(stderr, _("Only binary files changed.\n"));
strbuf_release(&s.answer); add_p_state_clear(&s);
strbuf_release(&s.buf);
strbuf_release(&s.plain);
strbuf_release(&s.colored);
clear_add_i_state(&s.s);
return 0; return 0;
} }