undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'np/pack-check'

Browse Source 
* np/pack-check:
  make verify-pack a bit more useful with bad packs
This commit is contained in:
Junio C Hamano 2008-06-01 23:39:24 -07:00
commit a44a5c006e
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
pack-check.c
View File

@ -25,10 +25,10 @@ static int verify_packfile(struct packed_git *p,
off_t index_size = p->index_size; off_t index_size = p->index_size;
const unsigned char *index_base = p->index_data; const unsigned char *index_base = p->index_data;
SHA_CTX ctx; SHA_CTX ctx;
unsigned char sha1[20]; unsigned char sha1[20], *pack_sig;
off_t offset = 0, pack_sig = p->pack_size - 20; off_t offset = 0, pack_sig_ofs = p->pack_size - 20;
uint32_t nr_objects, i; uint32_t nr_objects, i;
int err; int err = 0;
struct idx_entry *entries; struct idx_entry *entries;
/* Note that the pack header checks are actually performed by /* Note that the pack header checks are actually performed by
@ -38,21 +38,22 @@ static int verify_packfile(struct packed_git *p,
*/ */
SHA1_Init(&ctx); SHA1_Init(&ctx);
while (offset < pack_sig) { while (offset < pack_sig_ofs) {
unsigned int remaining; unsigned int remaining;
unsigned char *in = use_pack(p, w_curs, offset, &remaining); unsigned char *in = use_pack(p, w_curs, offset, &remaining);
offset += remaining; offset += remaining;
if (offset > pack_sig) if (offset > pack_sig_ofs)
remaining -= (unsigned int)(offset - pack_sig); remaining -= (unsigned int)(offset - pack_sig_ofs);
SHA1_Update(&ctx, in, remaining); SHA1_Update(&ctx, in, remaining);
} }
SHA1_Final(sha1, &ctx); SHA1_Final(sha1, &ctx);
if (hashcmp(sha1, use_pack(p, w_curs, pack_sig, NULL))) pack_sig = use_pack(p, w_curs, pack_sig_ofs, NULL);
return error("Packfile %s SHA1 mismatch with itself", if (hashcmp(sha1, pack_sig))
p->pack_name); err = error("%s SHA1 checksum mismatch",
if (hashcmp(sha1, index_base + index_size - 40)) p->pack_name);
return error("Packfile %s SHA1 mismatch with idx", if (hashcmp(index_base + index_size - 40, pack_sig))
p->pack_name); err = error("%s SHA1 does not match its inddex",
p->pack_name);
unuse_pack(w_curs); unuse_pack(w_curs);
/* Make sure everything reachable from idx is valid. Since we /* Make sure everything reachable from idx is valid. Since we
@ -72,22 +73,23 @@ static int verify_packfile(struct packed_git *p,
} }
qsort(entries, nr_objects, sizeof(*entries), compare_entries); qsort(entries, nr_objects, sizeof(*entries), compare_entries);
for (i = 0, err = 0; i < nr_objects; i++) { for (i = 0; i < nr_objects; i++) {
void *data; void *data;
enum object_type type; enum object_type type;
unsigned long size; unsigned long size;
data = unpack_entry(p, entries[i].offset, &type, &size); data = unpack_entry(p, entries[i].offset, &type, &size);
if (!data) { if (!data) {
err = error("cannot unpack %s from %s", err = error("cannot unpack %s from %s at offset %"PRIuMAX"",
sha1_to_hex(entries[i].sha1), p->pack_name); sha1_to_hex(entries[i].sha1), p->pack_name,
continue; (uintmax_t)entries[i].offset);
break;
} }
if (check_sha1_signature(entries[i].sha1, data, size, typename(type))) { if (check_sha1_signature(entries[i].sha1, data, size, typename(type))) {
err = error("packed %s from %s is corrupt", err = error("packed %s from %s is corrupt",
sha1_to_hex(entries[i].sha1), p->pack_name); sha1_to_hex(entries[i].sha1), p->pack_name);
free(data); free(data);
continue; break;
} }
free(data); free(data);
} }
@ -158,31 +160,28 @@ int verify_pack(struct packed_git *p, int verbose)
const unsigned char *index_base; const unsigned char *index_base;
SHA_CTX ctx; SHA_CTX ctx;
unsigned char sha1[20]; unsigned char sha1[20];
int ret; int err = 0;
struct pack_window *w_curs = NULL;
if (open_pack_index(p)) if (open_pack_index(p))
return error("packfile %s index not opened", p->pack_name); return error("packfile %s index not opened", p->pack_name);
index_size = p->index_size; index_size = p->index_size;
index_base = p->index_data; index_base = p->index_data;
ret = 0;
/* Verify SHA1 sum of the index file */ /* Verify SHA1 sum of the index file */
SHA1_Init(&ctx); SHA1_Init(&ctx);
SHA1_Update(&ctx, index_base, (unsigned int)(index_size - 20)); SHA1_Update(&ctx, index_base, (unsigned int)(index_size - 20));
SHA1_Final(sha1, &ctx); SHA1_Final(sha1, &ctx);
if (hashcmp(sha1, index_base + index_size - 20)) if (hashcmp(sha1, index_base + index_size - 20))
ret = error("Packfile index for %s SHA1 mismatch", err = error("Packfile index for %s SHA1 mismatch",
p->pack_name); p->pack_name);
if (!ret) { /* Verify pack file */
/* Verify pack file */ err |= verify_packfile(p, &w_curs);
struct pack_window *w_curs = NULL; unuse_pack(&w_curs);
ret = verify_packfile(p, &w_curs);
unuse_pack(&w_curs);
}
if (verbose) { if (verbose) {
if (ret) if (err)
printf("%s: bad\n", p->pack_name); printf("%s: bad\n", p->pack_name);
else { else {
show_pack_info(p); show_pack_info(p);
@ -190,5 +189,5 @@ int verify_pack(struct packed_git *p, int verbose)
} }
} }
return ret; return err;
} }