diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-28 17:34:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-28 17:34:42 (GMT) |
| commit | ad2d77760434e1650c186c71fa04a8fdbd77266c (patch) | |
| tree | e6f51ef4203047bda1d108bed7f3ca35196d8b4c /sha1_file.c | |
| parent | 2c608e0f7c1f0fb9fb3e42eb737d7b8543e11400 (diff) | |
| parent | ec9d224903053e045d99c36149703501098b021c (diff) | |
| download | git-ad2d77760434e1650c186c71fa04a8fdbd77266c.zip git-ad2d77760434e1650c186c71fa04a8fdbd77266c.tar.gz git-ad2d77760434e1650c186c71fa04a8fdbd77266c.tar.bz2 | |
Merge branch 'nd/pack-ofs-4gb-limit'
"git pack-objects" and "git index-pack" mostly operate with off_t
when talking about the offset of objects in a packfile, but there
were a handful of places that used "unsigned long" to hold that
value, leading to an unintended truncation.
* nd/pack-ofs-4gb-limit:
fsck: use streaming interface for large blobs in pack
pack-objects: do not truncate result in-pack object size on 32-bit systems
index-pack: correct "offset" type in unpack_entry_data()
index-pack: report correct bad object offsets even if they are large
index-pack: correct "len" type in unpack_data()
sha1_file.c: use type off_t* for object_info->disk_sizep
pack-objects: pass length to check_pack_crc() without truncation
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 d5e1121..cb571ac 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2281,7 +2281,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); |