diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-06-18 13:53:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-18 13:53:34 -0700 |
| commit | 0d0d56bca4118a079d2d7f51872623d197d7b46f (patch) | |
| tree | cb64f3dcbdbe21c7d275eb837dc9ba62c6c1fa26 | |
| parent | Merge branch 'cf/guideline-documenting-config-vars' (diff) | |
| parent | repo_logmsg_reencode: fix memory leak when use repo_logmsg_reencode () (diff) | |
| download | git-0d0d56bca4118a079d2d7f51872623d197d7b46f.tar.gz git-0d0d56bca4118a079d2d7f51872623d197d7b46f.zip | |
Merge branch 'ly/commit-buffer-reencode-leakfix'
Leakfix.
* ly/commit-buffer-reencode-leakfix:
repo_logmsg_reencode: fix memory leak when use repo_logmsg_reencode ()
| -rw-r--r-- | builtin/replay.c | 1 | ||||
| -rw-r--r-- | builtin/shortlog.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/builtin/replay.c b/builtin/replay.c index 225cef0880..6172c8aacc 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 30075b67be..fe15e11497 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); } |