undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer.c: always free() the "msgbuf" in do_pick_commit()

Browse Source 
In [1] the strbuf_release(&msgbuf) was moved into this
do_pick_commit(), but didn't take into account the case of [2], where
we'd return before the strbuf_release(&msgbuf).

Then when the "fixup" support was added in [3] this leak got worse, as
in this error case we added another place where we'd "return" before
reaching the strbuf_release().

This changes the behavior so that we'll call
update_abort_safety_file() in these cases where we'd previously
"return", but as noted in [4] "update_abort_safety_file() is a no-op
when rebasing and you're changing code that is only run when
rebasing.". Here "no-op" refers to the early return in
update_abort_safety_file() if git_path_seq_dir() doesn't exist.

1. 452202c74b (sequencer: stop releasing the strbuf in
   write_message(), 2016-10-21)
2. f241ff0d0a (prepare the builtins for a libified merge_recursive(),
   2016-07-26)
3. 6e98de72c0 (sequencer (rebase -i): add support for the 'fixup' and
   'squash' commands, 2017-01-02)
4. https://lore.kernel.org/git/bcace50b-a4c3-c468-94a3-4fe0c62b3671@dunelm.org.uk/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2023-02-06 20:08:11 +01:00 committed by Junio C Hamano
parent 94ad545d47
commit a5792e9d09
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sequencer.c
View File

@ -2277,8 +2277,10 @@ static int do_pick_commit(struct repository *r,
reword = 1; reword = 1;
else if (is_fixup(command)) { else if (is_fixup(command)) {
if (update_squash_messages(r, command, commit, if (update_squash_messages(r, command, commit,
opts, item->flags)) opts, item->flags)) {
return -1; res = -1;
goto leave;
}
flags |= AMEND_MSG; flags |= AMEND_MSG;
if (!final_fixup) if (!final_fixup)
msg_file = rebase_path_squash_msg(); msg_file = rebase_path_squash_msg();
@ -2288,9 +2290,11 @@ static int do_pick_commit(struct repository *r,
} else { } else {
const char *dest = git_path_squash_msg(r); const char *dest = git_path_squash_msg(r);
unlink(dest); unlink(dest);
if (copy_file(dest, rebase_path_squash_msg(), 0666)) if (copy_file(dest, rebase_path_squash_msg(), 0666)) {
return error(_("could not rename '%s' to '%s'"), res = error(_("could not rename '%s' to '%s'"),
rebase_path_squash_msg(), dest); rebase_path_squash_msg(), dest);
goto leave;
}
unlink(git_path_merge_msg(r)); unlink(git_path_merge_msg(r));
msg_file = dest; msg_file = dest;
flags |= EDIT_MSG; flags |= EDIT_MSG;
@ -2328,7 +2332,6 @@ static int do_pick_commit(struct repository *r,
free_commit_list(common); free_commit_list(common);
free_commit_list(remotes); free_commit_list(remotes);
} }
strbuf_release(&msgbuf);
/* /*
* If the merge was clean or if it failed due to conflict, we write * If the merge was clean or if it failed due to conflict, we write
@ -2402,6 +2405,7 @@ fast_forward_edit:
leave: leave:
free_message(commit, &msg); free_message(commit, &msg);
free(author); free(author);
strbuf_release(&msgbuf);
update_abort_safety_file(); update_abort_safety_file();
return res; return res;