From: Ævar Arnfjörð Bjarmason Date: Thu, 12 Jan 2023 12:55:24 +0000 (+0100) Subject: sparse-index.c: expand_to_path() can assume non-NULL "istate" X-Git-Tag: v2.40.0-rc0~66^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2cdf2c285b091f44e0bdc154ee39c0071f8934e;p=thirdparty%2Fgit.git sparse-index.c: expand_to_path() can assume non-NULL "istate" This function added in [1] was subsequently used in [2]. All of the calls to it are in name-hash.c, and come after calls to lazy_init_name_hash(istate). The first thing that function does is: if (istate->name_hash_initialized) return; So we can already assume that we have a non-NULL "istate" here, or we'd be segfaulting. Let's not confuse matters by making it appear that's not the case. 1. 71f82d032f3 (sparse-index: expand_to_path(), 2021-04-12) 2. 4589bca829a (name-hash: use expand_to_path(), 2021-04-12) Signed-off-by: Ævar Arnfjörð Bjarmason Acked-by: Derrick Stolee Signed-off-by: Junio C Hamano --- diff --git a/sparse-index.c b/sparse-index.c index 8c269dab80..65a08d33c7 100644 --- a/sparse-index.c +++ b/sparse-index.c @@ -547,7 +547,7 @@ void expand_to_path(struct index_state *istate, if (in_expand_to_path) return; - if (!istate || !istate->sparse_index) + if (!istate->sparse_index) return; if (!istate->repo)