[PATCH 2/5] sparse-index.c: expand_to_path() can assume non-NULL "istate"
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jan 10, 2023, 06:17 UTC
- Message-ID
- <patch-2.5-6db74fe958f-20230110T060340Z-avarab@gmail.com>
- In-Reply-To
- <cover-0.5-00000000000-20230110T060340Z-avarab@gmail.com>
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 <avarab@gmail.com> --- sparse-index.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sparse-index.c b/sparse-index.c index 8c269dab803..65a08d33c73 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)
-- 2.39.0.1195.gabc92c078c4