зеркало из https://github.com/microsoft/git.git
sequencer: fix a memory leak in sequencer_continue()
When continuing an interactive rebase after a merge conflict was solved, if the resolution could not be committed, sequencer_continue() would return early without releasing its todo list, resulting in a memory leak. This plugs this leak by jumping to the end of the function, where the todo list is deallocated. Signed-off-by: Alban Gruin <alban.gruin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
5fa0f5238b
Коммит
f6b9413baf
|
@ -4256,8 +4256,10 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
|
|||
if (is_rebase_i(opts)) {
|
||||
if ((res = read_populate_todo(r, &todo_list, opts)))
|
||||
goto release_todo_list;
|
||||
if (commit_staged_changes(r, opts, &todo_list))
|
||||
return -1;
|
||||
if (commit_staged_changes(r, opts, &todo_list)) {
|
||||
res = -1;
|
||||
goto release_todo_list;
|
||||
}
|
||||
} else if (!file_exists(get_todo_path(opts)))
|
||||
return continue_single_pick(r);
|
||||
else if ((res = read_populate_todo(r, &todo_list, opts)))
|
||||
|
|
Загрузка…
Ссылка в новой задаче