Skip to content

Commit 21abed5

Browse files
derrickstoleegitster
authored andcommitted
sha1_name: fix uninitialized memory errors
During abbreviation checks, we navigate to the position within a pack-index that an OID would be inserted and check surrounding OIDs for the maximum matching prefix. This position may be beyond the last position, because the given OID is lexicographically larger than every OID in the pack. Then nth_packed_object_oid() does not initialize "oid". Use the return value of nth_packed_object_oid() to prevent these errors. Also the comment about checking near-by objects miscounts the neighbours. If we have a hit at "first", we check "first-1" and "first+1" to make sure we have sufficiently long abbreviation not to match either. If we do not have a hit, "first" is the smallest among the objects that are larger than what we want to name, so we check that and "first-1" to make sure we have sufficiently long abbreviation not to match either. In either case, we only check up to two near-by objects. Reported-by: Christian Couder <[email protected]> Signed-off-by: Derrick Stolee <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0e87b85 commit 21abed5

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

sha1_name.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -542,20 +542,20 @@ static void find_abbrev_len_for_pack(struct packed_git *p,
542542
/*
543543
* first is now the position in the packfile where we would insert
544544
* mad->hash if it does not exist (or the position of mad->hash if
545-
* it does exist). Hence, we consider a maximum of three objects
545+
* it does exist). Hence, we consider a maximum of two objects
546546
* nearby for the abbreviation length.
547547
*/
548548
mad->init_len = 0;
549549
if (!match) {
550-
nth_packed_object_oid(&oid, p, first);
551-
extend_abbrev_len(&oid, mad);
550+
if (nth_packed_object_oid(&oid, p, first))
551+
extend_abbrev_len(&oid, mad);
552552
} else if (first < num - 1) {
553-
nth_packed_object_oid(&oid, p, first + 1);
554-
extend_abbrev_len(&oid, mad);
553+
if (nth_packed_object_oid(&oid, p, first + 1))
554+
extend_abbrev_len(&oid, mad);
555555
}
556556
if (first > 0) {
557-
nth_packed_object_oid(&oid, p, first - 1);
558-
extend_abbrev_len(&oid, mad);
557+
if (nth_packed_object_oid(&oid, p, first - 1))
558+
extend_abbrev_len(&oid, mad);
559559
}
560560
mad->init_len = mad->cur_len;
561561
}

0 commit comments

Comments
 (0)