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>
Alban Gruin committed
Nov 29, 2019 at 00:02 UTC
f6b9413bafbe22202007f9c891082c1df82fce52
1 file changed
+4
-2
sequencer.c
+4
-2
@@ -4256,8 +4256,10 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
4256
if (is_rebase_i(opts)) {
4257
if ((res = read_populate_todo(r, &todo_list, opts)))
4258
goto release_todo_list;
4259
- if (commit_staged_changes(r, opts, &todo_list))
4260
- return -1;
4259
+ if (commit_staged_changes(r, opts, &todo_list)) {
4260
+ res = -1;
4261
+ goto release_todo_list;
4262
+ }
4263
} else if (!file_exists(get_todo_path(opts)))
4264
return continue_single_pick(r);
4265
else if ((res = read_populate_todo(r, &todo_list, opts)))