| Message ID | 6f81e2e30609c70d4dcdbe9d4f11c4f6b5173c77.1707857541.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | FSMonitor edge cases on case-insensitive file systems | expand |
"Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Jeff Hostetler <jeffhostetler@github.com> > > The call to index_file_exists() in the loop in expand_to_path() passes > the wrong string length. Let's fix that. > > The loop in expand_to_path() searches the name-hash for each > sub-directory prefix in the provided pathname. That is, by searching > for "dir1/" then "dir1/dir2/" then "dir1/dir2/dir3/" and so on until > it finds a cache-entry representing a sparse directory. > > The code creates "strbuf path_mutable" to contain the working pathname > and modifies the buffer in-place by temporarily replacing the character > following each successive "/" with NUL for the duration of the call to > index_file_exists(). > > It does not update the strbuf.len during this substitution. > > Pass the patched length of the prefix path instead. > > Signed-off-by: Jeff Hostetler <jeffhostetler@github.com> > --- This looked familiar, and it turns out that https://lore.kernel.org/git/pull.1649.git.1706897095273.gitgitgadget@gmail.com/ has already been merged to 'master'. > sparse-index.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sparse-index.c b/sparse-index.c > index 3578feb2837..e48e40cae71 100644 > --- a/sparse-index.c > +++ b/sparse-index.c > @@ -579,8 +579,9 @@ void expand_to_path(struct index_state *istate, > replace++; > temp = *replace; > *replace = '\0'; > + substr_len = replace - path_mutable.buf; > if (index_file_exists(istate, path_mutable.buf, > - path_mutable.len, icase)) { > + substr_len, icase)) { > /* > * We found a parent directory in the name-hash > * hashtable, because only sparse directory entries > @@ -593,7 +594,6 @@ void expand_to_path(struct index_state *istate, > } > > *replace = temp; > - substr_len = replace - path_mutable.buf; > } > > cleanup:
On 2/13/24 5:07 PM, Junio C Hamano wrote: > "Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com> writes: > >> From: Jeff Hostetler <jeffhostetler@github.com> >> >> The call to index_file_exists() in the loop in expand_to_path() passes >> the wrong string length. Let's fix that. >> >> The loop in expand_to_path() searches the name-hash for each >> sub-directory prefix in the provided pathname. That is, by searching >> for "dir1/" then "dir1/dir2/" then "dir1/dir2/dir3/" and so on until >> it finds a cache-entry representing a sparse directory. >> >> The code creates "strbuf path_mutable" to contain the working pathname >> and modifies the buffer in-place by temporarily replacing the character >> following each successive "/" with NUL for the duration of the call to >> index_file_exists(). >> >> It does not update the strbuf.len during this substitution. >> >> Pass the patched length of the prefix path instead. >> >> Signed-off-by: Jeff Hostetler <jeffhostetler@github.com> >> --- > > This looked familiar, and it turns out that > > https://lore.kernel.org/git/pull.1649.git.1706897095273.gitgitgadget@gmail.com/ > > has already been merged to 'master'. > > Great, thanks! I'll drop from the next version.
diff --git a/sparse-index.c b/sparse-index.c index 3578feb2837..e48e40cae71 100644 --- a/sparse-index.c +++ b/sparse-index.c @@ -579,8 +579,9 @@ void expand_to_path(struct index_state *istate, replace++; temp = *replace; *replace = '\0'; + substr_len = replace - path_mutable.buf; if (index_file_exists(istate, path_mutable.buf, - path_mutable.len, icase)) { + substr_len, icase)) { /* * We found a parent directory in the name-hash * hashtable, because only sparse directory entries @@ -593,7 +594,6 @@ void expand_to_path(struct index_state *istate, } *replace = temp; - substr_len = replace - path_mutable.buf; } cleanup: