mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 12:59:41 +01:00
Code Activity

Merge branch 'ag/sequencer-continue-leakfix'

Browse source 
Leakfix.

* ag/sequencer-continue-leakfix:
  sequencer: fix a memory leak in sequencer_continue()
This commit is contained in:
Junio C Hamano 2019-12-10 13:11:46 -08:00
commit 7cc5f89088
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sequencer.c
View file

@ -4356,8 +4356,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)))