Skip to content

Commit 7cc5f89

Browse files
committed
Merge branch 'ag/sequencer-continue-leakfix'
Leakfix. * ag/sequencer-continue-leakfix: sequencer: fix a memory leak in sequencer_continue()
2 parents b089e5e + f6b9413 commit 7cc5f89

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

sequencer.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4356,8 +4356,10 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
43564356
if (is_rebase_i(opts)) {
43574357
if ((res = read_populate_todo(r, &todo_list, opts)))
43584358
goto release_todo_list;
4359-
if (commit_staged_changes(r, opts, &todo_list))
4360-
return -1;
4359+
if (commit_staged_changes(r, opts, &todo_list)) {
4360+
res = -1;
4361+
goto release_todo_list;
4362+
}
43614363
} else if (!file_exists(get_todo_path(opts)))
43624364
return continue_single_pick(r);
43634365
else if ((res = read_populate_todo(r, &todo_list, opts)))

0 commit comments

Comments
 (0)