Skip to content

Commit 56c5e82

Browse files
peffdscho
authored andcommitted
parse_pack_header_option(): avoid unaligned memory writes
In order to recreate a pack header in our in-memory buffer, we cast the buffer to a "struct pack_header" and assign the individual fields. This is reported to cause SIGBUS on sparc64 due to alignment issues. We can work around this by using put_be32() which will write individual bytes into the buffer. Reported-by: Koakuma <[email protected]> Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent b3c9b61 commit 56c5e82

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

packfile.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2297,17 +2297,20 @@ int is_promisor_object(const struct object_id *oid)
22972297

22982298
int parse_pack_header_option(const char *in, unsigned char *out, unsigned int *len)
22992299
{
2300-
struct pack_header *hdr;
2300+
unsigned char *hdr;
23012301
char *c;
23022302

2303-
hdr = (struct pack_header *)out;
2304-
hdr->hdr_signature = htonl(PACK_SIGNATURE);
2305-
hdr->hdr_version = htonl(strtoul(in, &c, 10));
2303+
hdr = out;
2304+
put_be32(hdr, PACK_SIGNATURE);
2305+
hdr += 4;
2306+
put_be32(hdr, strtoul(in, &c, 10));
2307+
hdr += 4;
23062308
if (*c != ',')
23072309
return -1;
2308-
hdr->hdr_entries = htonl(strtoul(c + 1, &c, 10));
2310+
put_be32(hdr, strtoul(c + 1, &c, 10));
2311+
hdr += 4;
23092312
if (*c)
23102313
return -1;
2311-
*len = sizeof(*hdr);
2314+
*len = hdr - out;
23122315
return 0;
23132316
}

0 commit comments

Comments
 (0)