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

Don't expect verify_pack() callers to set pack_size

Browse Source 
Since use_pack() will end up populating pack_size if it is not already set,
we can just adapt the code in verify_packfile() such that it doesn't require
pack_size to be set beforehand.

This allows callers not to have to set pack_size themselves, and we can thus
revert changes from 1c23d794 (Don't die in git-http-fetch when fetching packs).

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mike Hommey 2009-01-18 09:04:26 +01:00 committed by Junio C Hamano
parent 1b1b7b235b
commit 4277c6709d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pack-check.c
View File

@ -49,7 +49,7 @@ static int verify_packfile(struct packed_git *p,
const unsigned char *index_base = p->index_data; const unsigned char *index_base = p->index_data;
git_SHA_CTX ctx; git_SHA_CTX ctx;
unsigned char sha1[20], *pack_sig; unsigned char sha1[20], *pack_sig;
off_t offset = 0, pack_sig_ofs = p->pack_size - 20; off_t offset = 0, pack_sig_ofs = 0;
uint32_t nr_objects, i; uint32_t nr_objects, i;
int err = 0; int err = 0;
struct idx_entry *entries; struct idx_entry *entries;
@ -61,14 +61,16 @@ static int verify_packfile(struct packed_git *p,
*/ */
git_SHA1_Init(&ctx); git_SHA1_Init(&ctx);
while (offset < pack_sig_ofs) { do {
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 (!pack_sig_ofs)
pack_sig_ofs = p->pack_size - 20;
if (offset > pack_sig_ofs) if (offset > pack_sig_ofs)
remaining -= (unsigned int)(offset - pack_sig_ofs); remaining -= (unsigned int)(offset - pack_sig_ofs);
git_SHA1_Update(&ctx, in, remaining); git_SHA1_Update(&ctx, in, remaining);
} } while (offset < pack_sig_ofs);
git_SHA1_Final(sha1, &ctx); git_SHA1_Final(sha1, &ctx);
pack_sig = use_pack(p, w_curs, pack_sig_ofs, NULL); pack_sig = use_pack(p, w_curs, pack_sig_ofs, NULL);
if (hashcmp(sha1, pack_sig)) if (hashcmp(sha1, pack_sig))