diff mbox series

[v3,26/26] name-hash: use expand_to_path()

Message ID 1f3af8a886e5015a70a880dabd71f791d63c88df.1618261698.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit 4589bca829a2ace58bc98876cccd7dbd2e89f732
Headers show
Series Sparse Index: API protections | expand

Commit Message

Derrick Stolee April 12, 2021, 9:08 p.m. UTC
From: Derrick Stolee <dstolee@microsoft.com>

A sparse-index loads the name-hash data for its entries, including the
sparse-directory entries. If a caller asks for a path that is contained
within a sparse-directory entry, we need to expand to a full index and
recalculate the name hash table before returning the result. Insert
calls to expand_to_path() to protect against this case.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
 name-hash.c | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox series


diff --git a/name-hash.c b/name-hash.c
index d08deaa2c9e7..383cf589969c 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -8,6 +8,7 @@ 
 #include "cache.h"
 #include "thread-utils.h"
 #include "trace2.h"
+#include "sparse-index.h"
 struct dir_entry {
 	struct hashmap_entry ent;
@@ -683,6 +684,7 @@  int index_dir_exists(struct index_state *istate, const char *name, int namelen)
 	struct dir_entry *dir;
+	expand_to_path(istate, name, namelen, 0);
 	dir = find_dir_entry(istate, name, namelen);
 	return dir && dir->nr;
@@ -693,6 +695,7 @@  void adjust_dirname_case(struct index_state *istate, char *name)
 	const char *ptr = startPtr;
+	expand_to_path(istate, name, strlen(name), 0);
 	while (*ptr) {
 		while (*ptr && *ptr != '/')
@@ -716,6 +719,7 @@  struct cache_entry *index_file_exists(struct index_state *istate, const char *na
 	unsigned int hash = memihash(name, namelen);
+	expand_to_path(istate, name, namelen, icase);
 	ce = hashmap_get_entry_from_hash(&istate->name_hash, hash, NULL,
 					 struct cache_entry, ent);