Fix git-pack-objects for 64-bit platforms
The offset of an object in the pack is recorded as a 4-byte integer in the index file. When reading the offset from the mmap'ed index in prepare_pack_revindex(), the address is dereferenced as a long*. This works fine as long as the long type is four bytes wide. On NetBSD/sparc64, however, a long is 8 bytes wide and so dereferencing the offset produces garbage. [jc: taking suggestion by Linus to use uint32_t] Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Dennis Stosberg committed
May 11, 2006 at 19:36 UTC
66561f5a776f2343331fff5b98adff1000622f42
2 files changed
+2
-2
pack-objects.c
+1
-1
@@ -156,7 +156,7 @@ static void prepare_pack_revindex(struct pack_revindex *rix)
156
157
rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1));
158
for (i = 0; i < num_ent; i++) {
159
- long hl = *((long *)(index + 24 * i));
159
+ uint32_t hl = *((uint32_t *)(index + 24 * i));
160
rix->revindex[i] = ntohl(hl);
161
}
162
/* This knows the pack format -- the 20-byte trailer
sha1_file.c
+1
-1
@@ -1126,7 +1126,7 @@ int find_pack_entry_one(const unsigned char *sha1,
1126
int mi = (lo + hi) / 2;
1127
int cmp = memcmp(index + 24 * mi + 4, sha1, 20);
1128
if (!cmp) {
1129
- e->offset = ntohl(*((int*)(index + 24 * mi)));
1129
+ e->offset = ntohl(*((uint32_t *)(index + 24 * mi)));
1130
memcpy(e->sha1, sha1, 20);
1131
e->p = p;
1132
return 1;