Alban GruinWhen 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> --- I found this while adding support of rebase.missingCommitCheck to `git rebase --continue'.
sequencer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Show changes to sequencer.c +4 −2
diff --git a/sequencer.c b/sequencer.c index 8952cfa89b..64227a71e5 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4208,8 +4208,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)))
-- 2.24.0