Re: [PATCH] clear_pattern_list(): clear embedded hashmaps

From: Derrick Stolee <stolee@gmail.com>
Date: Aug 14, 2020, 12:13 UTC
Message-ID: <e0c102e9-57fd-ac0e-72ee-8be5f2095160@gmail.com>
In-Reply-To: <20200814111049.GA4101811@coredump.intra.peff.net>

On 8/14/2020 7:10 AM, Jeff King wrote:

Show 9 quoted lines

> Commit 96cc8ab531 (sparse-checkout: use hashmaps for cone patterns,
> 2019-11-21) added some auxiliary hashmaps to the pattern_list struct,
> but they're leaked when clear_pattern_list() is called.
> 
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> I have no idea how often this leak triggers in practice. I just noticed
> it while poking at LSan output (which we remain depressingly far
> from getting a clean run on).

Good find. The impact of the leak is likely low since we don't create multiple pattern_list structs per process (with these hashmaps) very often. The sparse-checkout builtin is likely the only place where multiple could be instantiated at the same time.

I also double-checked that hashmap_free_entries() handles a NULL hashmap pointer or uninitialized hashmap, which is what happens when cone mode is not enabled _or_ the pattern_list corresponds to something like a .gitignore file.

Thanks, -Stolee

Show 17 quoted lines

>  dir.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/dir.c b/dir.c
> index fe64be30ed..9411b94e9b 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -916,6 +916,8 @@ void clear_pattern_list(struct pattern_list *pl)
>  		free(pl->patterns[i]);
>  	free(pl->patterns);
>  	free(pl->filebuf);
> +	hashmap_free_entries(&pl->recursive_hashmap, struct pattern_entry, ent);
> +	hashmap_free_entries(&pl->parent_hashmap, struct pattern_entry, ent);
>  
>  	memset(pl, 0, sizeof(*pl));
>  }
>