From: "Lidong Yan via GitGitGadget" <gitgitgadget@gmail•com>
To: git@vger•kernel.org
Cc: Patrick Steinhardt <ps@pks•im>,
Lidong Yan <502024330056@smail•nju.edu.cn>,
Lidong Yan <502024330056@smail•nju.edu.cn>
Subject: [PATCH v2] repo_logmsg_reencode: fix memory leak when use repo_logmsg_reencode()
Date: Thu, 05 Jun 2025 06:27:26 +0000 [thread overview]
Message-ID: <pull.1988.v2.git.git.1749104846531.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1988.git.git.1749006607791.gitgitgadget@gmail.com>
From: Lidong Yan <502024330056@smail•nju.edu.cn>
pretty.c:repo_logmsg_reencode() allocated memory should be freed with
repo_unuse_commit_buffer(). Callers sometimes forgot free it at exit
point. Add `repo_unuse_commit_buffer()` in insert_records_from_trailers
at builtin/shortlog.c and create_commit at builtin/replay.c
Signed-off-by: Lidong Yan <502024330056@smail•nju.edu.cn>
---
repo_logmsg_reencode: fix memory leak when use repo_logmsg_reencode()
pretty.c:repo_logmsg_reencode() allocated memory should be freed with
repo_unuse_commit_buffer(). Callers sometimes forgot free it at exit
point. Add repo_unuse_commit_buffer() in insert_records_from_trailers at
builtin/shortlog.c and create_commit at builtin/replay.c.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1988%2Fbrandb97%2Ffix-reencode-leak-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1988/brandb97/fix-reencode-leak-v2
Pull-Request: https://github.com/git/git/pull/1988
Range-diff vs v1:
1: a414074f167 ! 1: f5165d6a102 repo_logmsg_reencode: fix memory leak when use repo_logmsg_reencode()
@@ builtin/replay.c: static struct commit *create_commit(struct repository *repo,
## builtin/shortlog.c ##
@@ builtin/shortlog.c: static void insert_records_from_trailers(struct shortlog *log,
- commit_buffer = repo_logmsg_reencode(the_repository, commit, NULL,
ctx->output_encoding);
body = strstr(commit_buffer, "\n\n");
-- if (!body)
-+ if (!body) {
-+ repo_unuse_commit_buffer(the_repository, commit, commit_buffer);
- return;
-+ }
+ if (!body)
+- return;
++ goto out;
trailer_iterator_init(&iter, body);
while (trailer_iterator_advance(&iter)) {
+@@ builtin/shortlog.c: static void insert_records_from_trailers(struct shortlog *log,
+ }
+ trailer_iterator_release(&iter);
+
++out:
+ strbuf_release(&ident);
+ repo_unuse_commit_buffer(the_repository, commit, commit_buffer);
+ }
builtin/replay.c | 1 +
builtin/shortlog.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/replay.c b/builtin/replay.c
index 225cef08807..6172c8aacc9 100644
--- a/builtin/replay.c
+++ b/builtin/replay.c
@@ -84,6 +84,7 @@ static struct commit *create_commit(struct repository *repo,
obj = parse_object(repo, &ret);
out:
+ repo_unuse_commit_buffer(the_repository, based_on, message);
free_commit_extra_headers(extra);
free_commit_list(parents);
strbuf_release(&msg);
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 30075b67be8..fe15e114973 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -187,7 +187,7 @@ static void insert_records_from_trailers(struct shortlog *log,
ctx->output_encoding);
body = strstr(commit_buffer, "\n\n");
if (!body)
- return;
+ goto out;
trailer_iterator_init(&iter, body);
while (trailer_iterator_advance(&iter)) {
@@ -206,6 +206,7 @@ static void insert_records_from_trailers(struct shortlog *log,
}
trailer_iterator_release(&iter);
+out:
strbuf_release(&ident);
repo_unuse_commit_buffer(the_repository, commit, commit_buffer);
}
base-commit: 7014b55638da979331baf8dc31c4e1d697cf2d67
--
gitgitgadget
next prev parent reply other threads:[~2025-06-05 6:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-04 3:10 [PATCH] repo_logmsg_reencode: fix memory leak when use repo_logmsg_reencode() Lidong Yan via GitGitGadget
2025-06-04 7:56 ` Patrick Steinhardt
2025-06-04 10:50 ` lidongyan
2025-06-05 7:23 ` Jeff King
2025-06-06 12:22 ` lidongyan
2025-06-05 6:27 ` Lidong Yan via GitGitGadget [this message]
2025-06-05 7:53 ` [PATCH v2] " Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1988.v2.git.git.1749104846531.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail$(echo .)com \
--cc=502024330056@smail$(echo .)nju.edu.cn \
--cc=git@vger$(echo .)kernel.org \
--cc=ps@pks$(echo .)im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox