From 626f9e243edbd8d82a27557b3433d19217714069 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Thu, 3 Dec 2015 16:27:15 -0500 Subject: [PATCH] index: canonicalize inserted paths safely When adding to the index, we look to see if a portion of the given path matches a portion of a path in the index. If so, we will use the existing path information. For example, when adding `foo/bar.c`, if there is an index entry to `FOO/other` and the filesystem is case insensitive, then we will put `bar.c` into the existing tree instead of creating a new one with a different case. Use `strncmp` to do that instead of `memcmp`. When we `bsearch` into the index, we locate the position where the new entry would go. The index entry at that position does not necessarily have a relation to the entry we're adding, so we cannot make assumptions and use `memcmp`. Instead, compare them as strings. When canonicalizing paths, we look for the first index entry that matches a given substring. --- src/index.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.c b/src/index.c index ca5b2c46e..391738e39 100644 --- a/src/index.c +++ b/src/index.c @@ -1167,7 +1167,7 @@ static int canonicalize_directory_path( while ((match = git_vector_get(&index->entries, pos))) { if (GIT_IDXENTRY_STAGE(match) != 0) { /* conflicts do not contribute to canonical paths */ - } else if (memcmp(search, match->path, search_len) == 0) { + } else if (strncmp(search, match->path, search_len) == 0) { /* prefer an exact match to the input filename */ best = match; best_len = search_len; -- 2.39.5