зеркало из https://github.com/microsoft/git.git
add -p: fix memory leak
asan reports that the C version of `add -p` is not freeing all the memory it allocates. Fix this by introducing a function to clear `struct add_p_state` and use it instead of freeing individual members. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
47ae905ffb
Коммит
324efcf6b6
24
add-patch.c
24
add-patch.c
|
@ -266,6 +266,20 @@ struct add_p_state {
|
|||
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, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
@ -1673,9 +1687,7 @@ int run_add_p(struct repository *r, enum add_p_mode mode,
|
|||
repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
|
||||
NULL, NULL, NULL) < 0) ||
|
||||
parse_diff(&s, ps) < 0) {
|
||||
strbuf_release(&s.plain);
|
||||
strbuf_release(&s.colored);
|
||||
clear_add_i_state(&s.s);
|
||||
add_p_state_clear(&s);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -1690,10 +1702,6 @@ int run_add_p(struct repository *r, enum add_p_mode mode,
|
|||
else if (binary_count == s.file_diff_nr)
|
||||
fprintf(stderr, _("Only binary files changed.\n"));
|
||||
|
||||
strbuf_release(&s.answer);
|
||||
strbuf_release(&s.buf);
|
||||
strbuf_release(&s.plain);
|
||||
strbuf_release(&s.colored);
|
||||
clear_add_i_state(&s.s);
|
||||
add_p_state_clear(&s);
|
||||
return 0;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче