From: Junio C Hamano <junkio@cox.net>
Date: Sun, 3 Sep 2006 21:44:46 +0000 (-0700)
Subject: pack-objects: fix thinko in revalidate code
X-Git-Tag: v1.4.3-rc1~135^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7042dbf7a1e9137eb856b3b086a062561c50b8a3;p=git.git

pack-objects: fix thinko in revalidate code

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>
---

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 11cc3c89f..5e42387a4 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -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;
 }