diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-07-05 17:05:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-12 17:14:29 (GMT) |
| commit | 211c61c6cf56699fc7b520a0206d23f5e4a7261b (patch) | |
| tree | 43035095197759a16d0cccb92af4264d29ad4b8e /sha1_file.c | |
| parent | 0b65a8dbdb38962e700ee16776a3042beb489060 (diff) | |
| download | git-211c61c6cf56699fc7b520a0206d23f5e4a7261b.zip git-211c61c6cf56699fc7b520a0206d23f5e4a7261b.tar.gz git-211c61c6cf56699fc7b520a0206d23f5e4a7261b.tar.bz2 | |
pack-objects: pass length to check_pack_crc() without truncation
On 32 bit systems with large file support, unsigned long is 32-bit
while the two offsets in the subtraction expression (pack-objects has
the exact same expression as in sha1_file.c but not shown in diff) are
in 64-bit. If an in-pack object is larger than 2^32 len/datalen is
truncated and we get a misleading "error: bad packed object CRC for
..." as a result.
Use off_t for len and datalen. check_pack_crc() already accepts this
argument as off_t and can deal with 4+ GB.
Noticed-by: Christoph Michelbach <michelbach94@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index d0f2aa0..cd9b560 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2282,7 +2282,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset, if (do_check_packed_object_crc && p->index_version > 1) { struct revindex_entry *revidx = find_pack_revindex(p, obj_offset); - unsigned long len = revidx[1].offset - obj_offset; + off_t len = revidx[1].offset - obj_offset; if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr)) { const unsigned char *sha1 = nth_packed_object_sha1(p, revidx->nr); |