зеркало из https://github.com/microsoft/git.git
merge-recursive: fix memleaks
These string_list instances were allocated by get_renames() and get_unmerged for the sole use of this caller, and the function is responsible for freeing them, not just their contents. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
d687839c29
Коммит
473091e21e
|
@ -1858,6 +1858,9 @@ int merge_trees(struct merge_options *o,
|
|||
string_list_clear(re_head, 0);
|
||||
string_list_clear(entries, 1);
|
||||
|
||||
free(re_merge);
|
||||
free(re_head);
|
||||
free(entries);
|
||||
}
|
||||
else
|
||||
clean = 1;
|
||||
|
|
Загрузка…
Ссылка в новой задаче