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

pack-objects: fix thinko in revalidate code

Browse Source 
When revalidating an entry from an existing pack entry->size and
entry->type are not necessarily the size of the final object
when the entry is deltified, but for base objects they must
match.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-09-03 14:44:46 -07:00
parent df6d61017a
commit 7042dbf7a1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin-pack-objects.c
View File

@ -247,12 +247,13 @@ static int revalidate_one(struct object_entry *entry,
void *data, char *type, unsigned long size)
{
int err;
if (!data)
return -1;
if (size != entry->size)
return -1;
err = check_sha1_signature(entry->sha1, data, size,
type_names[entry->type]);
if ((!data) ||
((entry->type != OBJ_DELTA) &&
( (size != entry->size) ||
strcmp(type_names[entry->type], type))))
err = -1;
else
err = check_sha1_signature(entry->sha1, data, size, type);
free(data);
return err;
}