From: Elijah Newren <newren@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 1/2] merge-ort: fix small memory leak in detect_and_process_renames()
Date: Sat, 19 Feb 2022 16:26:49 -0800 [thread overview]
Message-ID: <CABPp-BEfMVFYaN=17Hp5GgSLbhDnS5YOx2PBtme39xioQgBXTQ@mail.gmail.com> (raw)
In-Reply-To: <220219.86sfsecyy6.gmgdl@evledraar.gmail.com>
On Sat, Feb 19, 2022 at 1:45 PM Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
>
> On Sat, Feb 19 2022, Elijah Newren via GitGitGadget wrote:
>
> > From: Elijah Newren <newren@gmail.com>
> >
> > detect_and_process_renames() detects renames on both sides of history
> > and then combines these into a single diff_queue_struct. The combined
> > diff_queue_struct needs to be able to hold the renames found on either
> > side, and since it knows the (maximum) size it needs, it pre-emptively
> > grows the array to the appropriate size:
> >
> > ALLOC_GROW(combined.queue,
> > renames->pairs[1].nr + renames->pairs[2].nr,
> > combined.alloc);
> >
> > It then collects the items from each side:
> >
> > collect_renames(opt, &combined, MERGE_SIDE1, ...)
> > collect_renames(opt, &combined, MERGE_SIDE2, ...)
> >
> > Note, though, that collect_renames() sometimes determines that some
> > pairs are unnecessary and does not include them in the combined array.
> > When it is done, detect_and_process_renames() frees this memory:
> >
> > if (combined.nr) {
> > ...
> > free(combined.queue);
> > }
> >
> > The problem is that sometimes even when there are pairs, none of them are
> > necessary. Instead of checking combined.nr, we should check
> > combined.alloc. Doing so fixes the following memory leak, as reported
> > by valgrind:
> >
> > ==PID== 192 bytes in 1 blocks are definitely lost in loss record 107 of 134
> > ==PID== at 0xADDRESS: malloc
> > ==PID== by 0xADDRESS: realloc
> > ==PID== by 0xADDRESS: xrealloc (wrapper.c:126)
> > ==PID== by 0xADDRESS: detect_and_process_renames (merge-ort.c:3134)
> > ==PID== by 0xADDRESS: merge_ort_nonrecursive_internal (merge-ort.c:4610)
> > ==PID== by 0xADDRESS: merge_ort_internal (merge-ort.c:4709)
> > ==PID== by 0xADDRESS: merge_incore_recursive (merge-ort.c:4760)
> > ==PID== by 0xADDRESS: merge_ort_recursive (merge-ort-wrappers.c:57)
> > ==PID== by 0xADDRESS: try_merge_strategy (merge.c:753)
> > ==PID== by 0xADDRESS: cmd_merge (merge.c:1676)
> > ==PID== by 0xADDRESS: run_builtin (git.c:461)
> > ==PID== by 0xADDRESS: handle_builtin (git.c:713)
> > ==PID== by 0xADDRESS: run_argv (git.c:780)
> > ==PID== by 0xADDRESS: cmd_main (git.c:911)
> > ==PID== by 0xADDRESS: main (common-main.c:52)
> >
> > Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> > Signed-off-by: Elijah Newren <newren@gmail.com>
> > ---
> > merge-ort.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/merge-ort.c b/merge-ort.c
> > index d85b1cd99e9..4f5abc558c5 100644
> > --- a/merge-ort.c
> > +++ b/merge-ort.c
> > @@ -3175,7 +3175,7 @@ simple_cleanup:
> > free(renames->pairs[s].queue);
> > DIFF_QUEUE_CLEAR(&renames->pairs[s]);
> > }
> > - if (combined.nr) {
> > + if (combined.alloc) {
> > int i;
> > for (i = 0; i < combined.nr; i++)
> > pool_diff_free_filepair(&opt->priv->pool,
>
> This looks correct in that it'll work, but I still don't get why the
> pre-image or post-image is going through this indirection of checking
> "alloc" at all. Wouldn't this be correct & more straightforward (the
> memset part is optional, just did it for good measure)?:
>
> diff --git a/merge-ort.c b/merge-ort.c
> index 40ae4dc4e92..a01f28586a1 100644
> --- a/merge-ort.c
> +++ b/merge-ort.c
> @@ -3092,12 +3092,12 @@ static int detect_and_process_renames(struct merge_options *opt,
> struct tree *side1,
> struct tree *side2)
> {
> - struct diff_queue_struct combined;
> + struct diff_queue_struct combined = { 0 };
> struct rename_info *renames = &opt->priv->renames;
> int need_dir_renames, s, clean = 1;
> unsigned detection_run = 0;
> + int i;
>
> - memset(&combined, 0, sizeof(combined));
> if (!possible_renames(renames))
> goto cleanup;
>
> @@ -3181,13 +3181,10 @@ static int detect_and_process_renames(struct merge_options *opt,
> free(renames->pairs[s].queue);
> DIFF_QUEUE_CLEAR(&renames->pairs[s]);
> }
> - if (combined.alloc) {
> - int i;
> - for (i = 0; i < combined.nr; i++)
> - pool_diff_free_filepair(&opt->priv->pool,
> - combined.queue[i]);
> - free(combined.queue);
> - }
> +
> + for (i = 0; i < combined.nr; i++)
> + pool_diff_free_filepair(&opt->priv->pool, combined.queue[i]);
> + free(combined.queue);
>
> return clean;
> }
Hmm, good point; I like your version better. I'll change it, thanks.
next prev parent reply other threads:[~2022-02-20 0:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-19 17:09 [PATCH 0/2] Fix a couple small leaks in merge-ort Elijah Newren via GitGitGadget
2022-02-19 17:09 ` [PATCH 1/2] merge-ort: fix small memory leak in detect_and_process_renames() Elijah Newren via GitGitGadget
2022-02-19 21:44 ` Ævar Arnfjörð Bjarmason
2022-02-20 0:26 ` Elijah Newren [this message]
2022-02-19 17:10 ` [PATCH 2/2] merge-ort: fix small memory leak in unique_path() Elijah Newren via GitGitGadget
2022-02-19 22:22 ` Ævar Arnfjörð Bjarmason
2022-02-20 0:37 ` Elijah Newren
2022-02-20 1:29 ` [PATCH v2 0/2] Fix a couple small leaks in merge-ort Elijah Newren via GitGitGadget
2022-02-20 1:29 ` [PATCH v2 1/2] merge-ort: fix small memory leak in detect_and_process_renames() Elijah Newren via GitGitGadget
2022-02-21 2:35 ` Taylor Blau
2022-02-23 7:57 ` Elijah Newren
2022-06-01 10:00 ` Ævar Arnfjörð Bjarmason
2022-06-01 10:09 ` Flaky SANITIZE=leak test "regression" in v2.36.0 (was: [PATCH v2 1/2] merge-ort: fix small memory leak in detect_and_process_renames()) Ævar Arnfjörð Bjarmason
2022-02-20 1:29 ` [PATCH v2 2/2] merge-ort: fix small memory leak in unique_path() Elijah Newren via GitGitGadget
2022-02-21 2:43 ` [PATCH v2 0/2] Fix a couple small leaks in merge-ort Taylor Blau
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='CABPp-BEfMVFYaN=17Hp5GgSLbhDnS5YOx2PBtme39xioQgBXTQ@mail.gmail.com' \
--to=newren@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
/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).