diff options
author | Carlos Martín Nieto <cmn@dwim.me> | 2015-12-03 23:37:37 +0100 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-12-03 23:37:37 +0100 |
commit | 2d36e145d9acc25e6368d3be41546275a9185c24 (patch) | |
tree | 55bce104986ced6256a3bb4747da33af2d804d87 | |
parent | 15e6a5afb9217b09e60cd0aef48e0a7781f3922f (diff) | |
parent | 626f9e243edbd8d82a27557b3433d19217714069 (diff) | |
download | libgit2-2d36e145d9acc25e6368d3be41546275a9185c24.tar.gz |
Merge pull request #3534 from ethomson/index_canonicalize_fix
index: canonicalize inserted paths safely
-rw-r--r-- | src/index.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |