From f6b9413bafbe22202007f9c891082c1df82fce52 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Fri, 29 Nov 2019 00:02:03 +0100 Subject: 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 Signed-off-by: Junio C Hamano diff --git a/sequencer.c b/sequencer.c index 34ebf8e..cc03777 100644 --- a/sequencer.c +++ b/sequencer.c @@ -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))) -- cgit v0.10.2-6-g49f6