make find_pack_revindex() aware of the nasty world
It currently calls die() whenever given offset is not found thinking that such thing should never happen. But this offset may come from a corrupted pack whych _could_ happen and not be found. Callers should deal with this possibility gracefully instead. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nicolas Pitre committed
Oct 29, 2008 at 19:02 UTC
08698b1e32bc414f214b7300b40c30a30d9ecd1c
3 files changed
+16
-7
builtin-pack-objects.c
+2
@@ -1053,6 +1053,8 @@ static void check_object(struct object_entry *entry)
1053
if (reuse_delta && !entry->preferred_base) {
1054
struct revindex_entry *revidx;
1055
revidx = find_pack_revindex(p, ofs);
1056
+ if (!revidx)
1057
+ goto give_up;
1058
base_ref = nth_packed_object_sha1(p, revidx->nr);
1059
}
1060
entry->in_pack_header_size = used + used_0;
pack-revindex.c
+2
-1
@@ -140,7 +140,8 @@ struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs)
140
else
141
lo = mi + 1;
142
} while (lo < hi);
143
- die("internal error: pack revindex corrupt");
143
+ error("bad offset for revindex");
144
+ return NULL;
145
}
146
147
void discard_revindex(void)
sha1_file.c
+12
-6
@@ -1388,9 +1388,12 @@ static int packed_delta_info(struct packed_git *p,
1388
return OBJ_BAD;
1389
type = packed_object_info(p, base_offset, NULL);
1390
if (type <= OBJ_NONE) {
1391
- struct revindex_entry *revidx = find_pack_revindex(p, base_offset);
1392
- const unsigned char *base_sha1 =
1393
- nth_packed_object_sha1(p, revidx->nr);
1391
+ struct revindex_entry *revidx;
1392
+ const unsigned char *base_sha1;
1393
+ revidx = find_pack_revindex(p, base_offset);
1394
+ if (!revidx)
1395
+ return OBJ_BAD;
1396
+ base_sha1 = nth_packed_object_sha1(p, revidx->nr);
1397
mark_bad_packed_object(p, base_sha1);
1398
type = sha1_object_info(base_sha1, NULL);
1399
if (type <= OBJ_NONE)
@@ -1682,9 +1685,12 @@ static void *unpack_delta_entry(struct packed_git *p,
1685
* This is costly but should happen only in the presence
1686
* of a corrupted pack, and is better than failing outright.
1687
*/
1685
- struct revindex_entry *revidx = find_pack_revindex(p, base_offset);
1686
- const unsigned char *base_sha1 =
1687
- nth_packed_object_sha1(p, revidx->nr);
1688
+ struct revindex_entry *revidx;
1689
+ const unsigned char *base_sha1;
1690
+ revidx = find_pack_revindex(p, base_offset);
1691
+ if (!revidx)
1692
+ return NULL;
1693
+ base_sha1 = nth_packed_object_sha1(p, revidx->nr);
1694
error("failed to read delta base object %s"
1695
" at offset %"PRIuMAX" from %s",
1696
sha1_to_hex(base_sha1), (uintmax_t)base_offset,