undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read-cache: fix mem-pool allocation for multi-threaded index loading

Browse Source 
44c7e1a7e0 (mem-pool: use more standard initialization and finalization,
2020-08-15) moved the allocation of the mem-pool structure to callers.
It also added an allocation to load_cache_entries_threaded(), but for an
unrelated mem-pool.  Fix that by allocating the correct one instead --
the one that is initialized two lines later.

Reported-by: Sandor Bodo-Merle <sbodomerle@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2020-09-04 19:33:55 +02:00 committed by Junio C Hamano
parent f87bf28483
commit bcd2c5eede
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
read-cache.c
View File

@ -2101,7 +2101,7 @@ static unsigned long load_cache_entries_threaded(struct index_state *istate, con
nr = 0; nr = 0;
for (j = p->ieot_start; j < p->ieot_start + p->ieot_blocks; j++) for (j = p->ieot_start; j < p->ieot_start + p->ieot_blocks; j++)
nr += p->ieot->entries[j].nr; nr += p->ieot->entries[j].nr;
istate->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool)); p->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool));
if (istate->version == 4) { if (istate->version == 4) {
mem_pool_init(p->ce_mem_pool, mem_pool_init(p->ce_mem_pool,
estimate_cache_size_from_compressed(nr)); estimate_cache_size_from_compressed(nr));