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

* rs/fix-alt-odb-path-comparison: sha1_file: avoid overrunning alternate object base string
git-mirror · Jul 10, 2014 · b41a463 · b41a463
2 parents e7cdec6 + 80b4785
commit b41a463
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/sha1_file.c b/sha1_file.c
@@ -315,7 +315,8 @@ static int link_alt_odb_entry(const char *entry, const char *relative_base, int
 	 * thing twice, or object directory itself.
 	 */
 	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);
 			return -1;
 		}