packed_object_info(): convert to new revindex API

Convert another call of 'find_pack_revindex()' to its replacement 'pack_pos_to_offset()'. Likewise: - Avoid manipulating `struct packed_git`'s `revindex` pointer directly by removing the pointer-as-array indexing. - Add an additional guard to check that the offset 'obj_offset()' points to a real object. This should be the case with well-behaved callers to 'packed_object_info()', but isn't guarenteed. Other blocks that fill in various other values from the 'struct object_info' request handle bad inputs by setting the type to 'OBJ_BAD' and jumping to 'out'. Do the same when given a bad offset here. The previous code would have segfaulted when given a bad 'obj_offset' value, since 'find_pack_revindex()' would return 'NULL', and then the line that fills 'oi->disk_sizep' would try to access 'NULL[1]' with a stride of 16 bytes (the width of 'struct revindex_entry)'. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed Jan 13, 2021 at 17:24 UTC fc150caf67d91b0eeba359d63b4ce707aba8b5ca
1 file changed +9 -2
packfile.c
+9 -2
@@ -1537,8 +1537,15 @@ int packed_object_info(struct repository *r, struct packed_git *p,
1537 }
1538
1539 if (oi->disk_sizep) {
1540 - struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
1541 - *oi->disk_sizep = revidx[1].offset - obj_offset;
1540 + uint32_t pos;
1541 + if (offset_to_pack_pos(p, obj_offset, &pos) < 0) {
1542 + error("could not find object at offset %"PRIuMAX" "
1543 + "in pack %s", (uintmax_t)obj_offset, p->pack_name);
1544 + type = OBJ_BAD;
1545 + goto out;
1546 + }
1547 +
1548 + *oi->disk_sizep = pack_pos_to_offset(p, pos + 1) - obj_offset;
1549 }
1550
1551 if (oi->typep || oi->type_name) {