From: "René Scharfe" <l.s.r@web.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git List" <git@vger.kernel.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Taylor Blau" <me@ttaylorr.com>,
"Christian Couder" <chriscool@tuxfamily.org>,
"Jeff King" <peff@peff.net>
Subject: Re: [PATCH v2 3/3] Revert "pack-objects: lazily set up "struct rev_info", don't leak"
Date: Mon, 28 Nov 2022 12:26:31 +0100 [thread overview]
Message-ID: <d10de9b5-e5ff-18d6-d950-1d090d87b113@web.de> (raw)
In-Reply-To: <xmqqv8mz5ras.fsf@gitster.g>
Am 28.11.2022 um 11:03 schrieb Junio C Hamano:
> René Scharfe <l.s.r@web.de> writes:
>
>> This reverts commit 5cb28270a1ff94a0a23e67b479bbbec3bc993518.
>>
>> 5cb28270a1 (pack-objects: lazily set up "struct rev_info", don't leak,
>> 2022-03-28) avoided leaking rev_info allocations in many cases by
>> calling repo_init_revisions() only when the .filter member was actually
>> needed, but then still leaking it. That was fixed later by 2108fe4a19
>> (revisions API users: add straightforward release_revisions(),
>> 2022-04-13), making the reverted commit unnecessary.
>
> Hmph, with this merged, 'seen' breaks linux-leaks job in a strange
> way.
>
> https://github.com/git/git/actions/runs/3563546608/jobs/5986458300#step:5:3917
>
> Does anybody want to help looking into it?
The patch exposes that release_revisions() leaks the diffopt allocations
as we're yet to address the TODO added by 54c8a7c379 (revisions API: add
a TODO for diff_free(&revs->diffopt), 2022-04-14).
The patch below plugs it locally.
--- >8 ---
Subject: [PATCH 4/3] fixup! revision: free diffopt in release_revisions()
Signed-off-by: René Scharfe <l.s.r@web.de>
---
builtin/pack-objects.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 3e74fbb0cd..a47a3f0fba 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -4462,6 +4462,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
} else {
get_object_list(&revs, rp.nr, rp.v);
}
+ diff_free(&revs.diffopt);
release_revisions(&revs);
cleanup_preferred_base();
if (include_tag && nr_result)
--
2.30.2
next prev parent reply other threads:[~2022-11-28 11:27 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-12 10:42 [PATCH 0/3] pack-objects: fix and simplify --filter handling René Scharfe
2022-11-12 10:44 ` [PATCH 1/3] pack-objects: fix handling of multiple --filter options René Scharfe
2022-11-12 11:41 ` Ævar Arnfjörð Bjarmason
2022-11-13 17:31 ` René Scharfe
2022-11-12 16:58 ` Jeff King
2022-11-13 5:01 ` Taylor Blau
2022-11-13 16:44 ` Jeff King
2022-11-13 17:31 ` René Scharfe
2022-11-12 10:44 ` [PATCH 2/3] pack-object: simplify --filter handling René Scharfe
2022-11-12 11:45 ` Ævar Arnfjörð Bjarmason
2022-11-12 17:02 ` Jeff King
2022-11-13 16:49 ` Jeff King
2022-11-13 17:31 ` René Scharfe
2022-11-12 10:46 ` [PATCH 3/3] list-objects-filter: remove OPT_PARSE_LIST_OBJECTS_FILTER_INIT() René Scharfe
2022-11-20 10:03 ` [PATCH v2 0/3] pack-objects: fix and simplify --filter handling René Scharfe
2022-11-20 10:06 ` [PATCH v2 1/3] t5317: stop losing return codes of git ls-files René Scharfe
2022-11-20 10:07 ` [PATCH v2 2/3] t5317: demonstrate failure to handle multiple --filter options René Scharfe
2022-11-20 10:13 ` [PATCH v2 3/3] Revert "pack-objects: lazily set up "struct rev_info", don't leak" René Scharfe
2022-11-28 10:03 ` Junio C Hamano
2022-11-28 11:12 ` Ævar Arnfjörð Bjarmason
2022-11-28 12:00 ` [PATCH] t5314: check exit code of "rev-parse" Ævar Arnfjörð Bjarmason
2022-11-28 13:51 ` René Scharfe
2022-11-28 14:18 ` [PATCH v2] t5314: check exit code of "git" Ævar Arnfjörð Bjarmason
2022-11-28 11:26 ` René Scharfe [this message]
2022-11-28 11:31 ` [PATCH v2 3/3] Revert "pack-objects: lazily set up "struct rev_info", don't leak" Ævar Arnfjörð Bjarmason
2022-11-28 12:24 ` Ævar Arnfjörð Bjarmason
2022-11-28 15:16 ` René Scharfe
2022-11-28 15:27 ` Ævar Arnfjörð Bjarmason
2022-11-28 14:29 ` René Scharfe
2022-11-28 14:34 ` Ævar Arnfjörð Bjarmason
2022-11-28 15:56 ` René Scharfe
2022-11-28 17:57 ` René Scharfe
2022-11-28 18:32 ` Ævar Arnfjörð Bjarmason
2022-11-28 21:57 ` René Scharfe
2022-11-29 1:26 ` Jeff King
2022-11-29 1:46 ` Junio C Hamano
2022-11-29 10:25 ` Ævar Arnfjörð Bjarmason
2022-11-29 7:12 ` Ævar Arnfjörð Bjarmason
2022-11-29 19:18 ` René Scharfe
2022-11-28 17:57 ` Ævar Arnfjörð Bjarmason
2022-11-22 19:02 ` [PATCH v2 0/3] pack-objects: fix and simplify --filter handling Jeff King
2022-11-29 12:19 ` [PATCH v3 0/5] " René Scharfe
2022-11-29 12:21 ` [PATCH v3 1/5] t5317: stop losing return codes of git ls-files René Scharfe
2022-11-29 12:22 ` [PATCH v3 2/5] t5317: demonstrate failure to handle multiple --filter options René Scharfe
2022-11-29 12:23 ` [PATCH v3 3/5] pack-objects: fix handling of " René Scharfe
2022-11-30 1:09 ` Junio C Hamano
2022-11-30 7:11 ` René Scharfe
2022-11-29 12:25 ` [PATCH v3 4/5] pack-objects: simplify --filter handling René Scharfe
2022-11-29 13:27 ` Ævar Arnfjörð Bjarmason
2022-11-30 11:23 ` René Scharfe
2022-11-29 12:26 ` [PATCH v3 5/5] list-objects-filter: remove OPT_PARSE_LIST_OBJECTS_FILTER_INIT() René Scharfe
2022-11-30 1:20 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d10de9b5-e5ff-18d6-d950-1d090d87b113@web.de \
--to=l.s.r@web.de \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).