diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-12-10 13:11:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-10 13:11:46 -0800 |
| commit | 7cc5f890882214c12c08067404321043fb93e048 (patch) | |
| tree | 02980bcc1f20ddfcd0561c6ec896d49a944dc76e | |
| parent | Merge branch 'em/test-skip-regex-illseq' (diff) | |
| parent | sequencer: fix a memory leak in sequencer_continue() (diff) | |
| download | tgif-7cc5f890882214c12c08067404321043fb93e048.tar.xz | |
Merge branch 'ag/sequencer-continue-leakfix'
Leakfix.
* ag/sequencer-continue-leakfix:
sequencer: fix a memory leak in sequencer_continue()
| -rw-r--r-- | sequencer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index 8a51c9042b..1bee26ebd5 100644 --- a/sequencer.c +++ b/sequencer.c @@ -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))) |