Skip to content

Commit 19517fb

Browse files
stefanbellergitster
authored andcommitted
sequencer.c: plug leaks in do_pick_commit
Going to leave, we additionally free the author and commit message and make sure to call update_abort_safety_file(). Signed-off-by: Stefan Beller <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e6be8e2 commit 19517fb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

sequencer.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1772,7 +1772,8 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
17721772
res = do_recursive_merge(base, next, base_label, next_label,
17731773
&head, &msgbuf, opts);
17741774
if (res < 0)
1775-
return res;
1775+
goto leave;
1776+
17761777
res |= write_message(msgbuf.buf, msgbuf.len,
17771778
git_path_merge_msg(), 0);
17781779
} else {

0 commit comments

Comments
 (0)