[PATCH 1/2] commit: fix "author_ident" leak
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2022-02-16 08:21:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
Fix a leak in cmd_commit(), since 4c28e4ada03 (commit: die before asking to edit the log message, 2010-12-20) we have been freeing the "author_ident" "struct strbuf", but not in the case where prepare_to_commit() returns non-zero. This fixes a leak demonstrated by e.g. "t3505-cherry-pick-empty.sh", but unfortunately we cannot mark it or other affected tests as passing now with "TEST_PASSES_SANITIZE_LEAK=true" as we'll need to fix many other memory leaks before doing so. Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- builtin/commit.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 6b99ac276d8..696b3527adf 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c@@ -1689,6 +1689,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) struct commit *current_head = NULL; struct commit_extra_header *extra = NULL; struct strbuf err = STRBUF_INIT; + int ret = 0; if (argc == 2 && !strcmp(argv[1], "-h")) usage_with_options(builtin_commit_usage, builtin_commit_options);
@@ -1723,8 +1724,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix) running hooks, writing the trees, and interacting with the user. */ if (!prepare_to_commit(index_file, prefix, current_head, &s, &author_ident)) { + ret = 1; rollback_index_files(); - return 1; + goto cleanup; } /* Determine parents */
@@ -1822,7 +1824,6 @@ int cmd_commit(int argc, const char **argv, const char *prefix) rollback_index_files(); die(_("failed to write commit object")); } - strbuf_release(&author_ident); free_commit_extra_headers(extra); if (update_head_with_reflog(current_head, &oid, reflog_msg, &sb,
@@ -1863,7 +1864,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix) apply_autostash(git_path_merge_autostash(the_repository)); +cleanup: + strbuf_release(&author_ident); UNLEAK(err); UNLEAK(sb); - return 0; + return ret; }
--
2.35.1.1028.g2d2d4be19de