From bcd2c5eedecf473fa6b15ebda798ce54bb3c75ea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20Scharfe?= Date: Fri, 4 Sep 2020 19:33:55 +0200 Subject: [PATCH] read-cache: fix mem-pool allocation for multi-threaded index loading MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)); -- 2.39.5