[PATCH v2 2/4] verify_packfile(): check as many object as possible in a pack
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Nov 7, 2011, 02:59 UTC
- Message-ID
- <1320634766-24511-3-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1320634766-24511-1-git-send-email-pclouds@gmail.com>
verify_packfile() checks for whole pack integerity first, then each object individually. Once we get past whole pack check, we can identify all objects in the pack. If there's an error with one object, we should continue to check the next objects to salvage as many objects as possible instead of stopping the process.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- pack-check.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/pack-check.c b/pack-check.c index 0c19b6e..7ac9b3a 100644 --- a/pack-check.c +++ b/pack-check.c @@ -113,18 +113,13 @@ static int verify_packfile(struct packed_git *p, p->pack_name, (uintmax_t)offset); } data = unpack_entry(p, entries[i].offset, &type, &size); - if (!data) { + if (!data) err = error("cannot unpack %s from %s at offset %"PRIuMAX"", sha1_to_hex(entries[i].sha1), p->pack_name, (uintmax_t)entries[i].offset); - break; - } - if (check_sha1_signature(entries[i].sha1, data, size, typename(type))) { + else if (check_sha1_signature(entries[i].sha1, data, size, typename(type))) err = error("packed %s from %s is corrupt", sha1_to_hex(entries[i].sha1), p->pack_name); - free(data); - break; - } free(data); } free(entries);
-- 1.7.4.74.g639db