mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/fix-alt-odb-path-comparison'

Browse Source 
* rs/fix-alt-odb-path-comparison:
  sha1_file: avoid overrunning alternate object base string
This commit is contained in:
Junio C Hamano
2014-07-10 11:27:52 -07:00
parent e7cdec622a 80b47854ca
commit b41a4636ee
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sha1_file.c
View File

@ -315,7 +315,8 @@ static int link_alt_odb_entry(const char *entry, const char *relative_base, int
* thing twice, or object directory itself. * thing twice, or object directory itself.
*/ */
for (alt = alt_odb_list; alt; alt = alt->next) { for (alt = alt_odb_list; alt; alt = alt->next) {
if (!memcmp(ent->base, alt->base, pfxlen)) { if (pfxlen == alt->name - alt->base - 1 &&
!memcmp(ent->base, alt->base, pfxlen)) {
free(ent); free(ent);
return -1; return -1;
} }