From: René Scharfe Date: Fri, 4 Sep 2020 17:33:55 +0000 (+0200) Subject: read-cache: fix mem-pool allocation for multi-threaded index loading X-Git-Tag: v2.29.0-rc0~77^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcd2c5eedecf473fa6b15ebda798ce54bb3c75ea;p=thirdparty%2Fgit.git read-cache: fix mem-pool allocation for multi-threaded index loading 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 Signed-off-by: René Scharfe Reviewed-by: Elijah Newren Signed-off-by: Junio C Hamano --- diff --git a/read-cache.c b/read-cache.c index fa291cdbee..ecf6f68994 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2101,7 +2101,7 @@ static unsigned long load_cache_entries_threaded(struct index_state *istate, con nr = 0; for (j = p->ieot_start; j < p->ieot_start + p->ieot_blocks; j++) 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) { mem_pool_init(p->ce_mem_pool, estimate_cache_size_from_compressed(nr));