diff options
| author | Nicolas Pitre <nico@cam.org> | 2008-10-29 19:02:49 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-02 15:22:35 -0800 |
| commit | 08698b1e32bc414f214b7300b40c30a30d9ecd1c (patch) | |
| tree | 1fc01119e8590049d0f5e5949b4b6a9d83db75eb /builtin-pack-objects.c | |
| parent | 03d660150cbc80cd7d2ec90c3c4e6ce563295e3a (diff) | |
| download | git-08698b1e32bc414f214b7300b40c30a30d9ecd1c.tar.gz | |
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>
Diffstat (limited to 'builtin-pack-objects.c')
| -rw-r--r-- | builtin-pack-objects.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index c05fb944b0..04a5a55ef9 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1053,6 +1053,8 @@ static void check_object(struct object_entry *entry) if (reuse_delta && !entry->preferred_base) { struct revindex_entry *revidx; revidx = find_pack_revindex(p, ofs); + if (!revidx) + goto give_up; base_ref = nth_packed_object_sha1(p, revidx->nr); } entry->in_pack_header_size = used + used_0; |