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

[thirdparty/git.git] / sequencer.c

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