mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-28 04:36:10 +02:00
Code

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 <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2018-06-01 13:01:45 -07:00 committed by Junio C Hamano
parent e6be8e2f9f
commit 19517fb964
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sequencer.c
View File

@ -1772,7 +1772,8 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
res = do_recursive_merge(base, next, base_label, next_label,
&head, &msgbuf, opts);
if (res < 0)
return res;
goto leave;
res |= write_message(msgbuf.buf, msgbuf.len,
git_path_merge_msg(), 0);
} else {