diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-13 10:42:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-13 10:47:21 -0700 |
| commit | a5a46eb90f530c731084a57783ca9fdbf1a52163 (patch) | |
| tree | 13b77bd8f9ad3a31b25b48b1af41993fafc9ae94 | |
| parent | befc5ed3799cb6fcbaa7de03e7fa1760e846853c (diff) | |
| download | git-a5a46eb90f530c731084a57783ca9fdbf1a52163.tar.gz | |
archive: ustar header checksum is computed unsigned
POSIX.1 (pax) is pretty clear on this:
The chksum field shall be the ISO/IEC 646:1991 standard IRV
representation of the octal value of the simple sum of all octets
in the header logical record. Each octet in the header shall be
treated as an unsigned value. These values shall be added to an
unsigned integer, initialized to zero, the precision of which is
not less than 17 bits. When calculating the checksum, the chksum
field is treated as if it were all <space> characters.
so is GNU:
http://www.gnu.org/software/tar/manual/html_node/Checksumming.html
Found by 7zip folks and reported by Rafał Mużyło.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | archive-tar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/archive-tar.c b/archive-tar.c index dc91c6b50d..0ba3f25cf5 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -139,13 +139,13 @@ static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword, static unsigned int ustar_header_chksum(const struct ustar_header *header) { - const char *p = (const char *)header; + const unsigned char *p = (const unsigned char *)header; unsigned int chksum = 0; - while (p < header->chksum) + while (p < (const unsigned char *)header->chksum) chksum += *p++; chksum += sizeof(header->chksum) * ' '; p += sizeof(header->chksum); - while (p < (const char *)header + sizeof(struct ustar_header)) + while (p < (const unsigned char *)header + sizeof(struct ustar_header)) chksum += *p++; return chksum; } |